X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=b571440544eea389860dda85ffab45d3b32ce8a4;hb=d1f6afc897c9e4e95cb6ae7334444f27496e06ae;hp=ae48d1ac68a208881e616fa813db8ce0ccd9edfa;hpb=49501a8888003350ff94a75f20f5b30254d9bf2c;p=pspp

diff --git a/Makefile.am b/Makefile.am
index ae48d1ac68..b571440544 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,25 +24,13 @@ BUILT_SOURCES =
 built-sources: $(BUILT_SOURCES)
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/gl \
-	-I$(top_builddir)/gl \
+	-I"$(top_srcdir)/gl" \
+	-I"$(top_builddir)/gl" \
 	-DINSTALLDIR=\"$(bindir)\"
 
 AM_V_P ?= :
 
-AM_CFLAGS=
-
-if cc_is_gcc
-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 =
+AM_CFLAGS=$(WARNING_FLAGS)
 
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
@@ -64,7 +52,7 @@ DIST_HOOKS =
 INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
-SUFFIXES = .q
+SUFFIXES =
 LDADD = gl/libgl.la
 
 gl/libgl.la: config.h
@@ -95,6 +83,7 @@ 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
@@ -158,8 +147,13 @@ distfiles: Makefile
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" \
 	  | LC_ALL=C sort -u > $@
 CLEANFILES += distfiles gitfiles missing-distfiles
-PHONY += dist-hook-git dummy-prerequisistes
+PHONY += dist-hook-git
+
+$(bin_PROGRAMS) $(RECURSIVE_TARGETS) dist: $(BUILT_SOURCES) gl/libgl.la
+
+
 
--include dummy-prerequisistes
+mimedir = $(datadir)/mime/packages
+mime_DATA =pspp.xml
+EXTRA_DIST += pspp.xml
 
-dummy-prerequisistes: $(BUILT_SOURCES) gl/libgl.la