X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=5967656765c580e84dfe9554036ad2a48f7596af;hb=cbb7b5901e2e6bc7b646ef0bfcab121a8ad567da;hp=3f4a9c6250a943e6e2b41d5c829ef31e91777895;hpb=5945ce59bf14d8e5ffa50ef82ce56e79800a9bb2;p=pspp

diff --git a/Makefile.am b/Makefile.am
index 3f4a9c6250..5967656765 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## PSPP - a program for statistical analysis.
-## Copyright (C) 2019 Free Software Foundation, Inc.
+## Copyright (C) 2019, 2020 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@ AUTOMAKE_OPTIONS = std-options check-news 1.10.1 subdir-objects
 SUBDIRS = gl po
 DISTCLEANFILES = ./po/stamp-po xconfigure
 BUILT_SOURCES =
+built-sources: $(BUILT_SOURCES)
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/gl \
@@ -32,17 +33,10 @@ AM_V_P ?= :
 AM_CFLAGS=
 
 if cc_is_gcc
-AM_CFLAGS+=-Wall -W -Wwrite-strings -Wstrict-prototypes \
+AM_CFLAGS+=-Wall -Wextra -Wwrite-strings -Wstrict-prototypes \
 -Wpointer-arith -Wno-sign-compare -Wmissing-prototypes
 endif
 
-.q.c:
-	@$(MKDIR_P) `dirname $@`
-	$(AM_V_GEN)./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
-
-$(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD)
-all_q_sources =
-
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
@@ -63,9 +57,12 @@ DIST_HOOKS =
 INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
-SUFFIXES = .q
+SUFFIXES =
 LDADD = gl/libgl.la
 
+gl/libgl.la: config.h
+	$(MAKE) -C gl
+
 # This ensures that files added to EXTRA_DIST are always distributed,
 # even if they are inside an Automake if...endif conditional block that is
 # disabled by some particular "configure" run.  For more information, see:
@@ -86,11 +83,12 @@ DIST_HOOKS += generate-changelog
 include $(top_srcdir)/build-aux/automake.mk
 include $(top_srcdir)/po/automake.mk
 include $(top_srcdir)/lib/automake.mk
-include $(top_srcdir)/doc/automake.mk
 include $(top_srcdir)/examples/automake.mk
 include $(top_srcdir)/src/automake.mk
 include $(top_srcdir)/utilities/automake.mk
 include $(top_srcdir)/tests/automake.mk
+include $(top_srcdir)/doc/automake.mk
+include $(top_srcdir)/Windows/automake.mk
 
 if WITH_PERL_MODULE
 include $(top_srcdir)/perl-module/automake.mk
@@ -154,4 +152,13 @@ distfiles: Makefile
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" \
 	  | LC_ALL=C sort -u > $@
 CLEANFILES += distfiles gitfiles missing-distfiles
-.PHONY: dist-hook-git
+PHONY += dist-hook-git
+
+$(bin_PROGRAMS) $(RECURSIVE_TARGETS) dist: $(BUILT_SOURCES) gl/libgl.la
+
+
+
+mimedir = $(datadir)/mime/packages
+mime_DATA =pspp.xml
+EXTRA_DIST += pspp.xml
+