X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=Makefile.am;h=d02ed4e19ad90897805063ed551b97b18b963de3;hb=0498114186f126d786cc0f3cf6686a43b8513e62;hp=dd3b1cb80e2273004b1268a5686da6ed31719e8e;hpb=1d2780996f3f615c2ea19ddfc1c9e1592fa64b70;p=pspp-builds.git

diff --git a/Makefile.am b/Makefile.am
index dd3b1cb8..d02ed4e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@ SUBDIRS = intl gl po
 DISTCLEANFILES = ./intl/plural.c ./po/stamp-po
 BUILT_SOURCES =
 
-AM_CPPFLAGS=-I$(top_srcdir)/intl -I$(top_srcdir)/gl -I$(top_builddir)/gl
+AM_CPPFLAGS=-I$(top_srcdir)/intl -I$(top_builddir)/intl \
+	-I$(top_srcdir)/gl -I$(top_builddir)/gl
 
 AM_CFLAGS=
 
@@ -15,19 +16,13 @@ AM_CFLAGS+=-Wall -W -Wwrite-strings -Wstrict-prototypes \
 -Wpointer-arith -Wno-sign-compare -Wmissing-prototypes
 endif
 
-if unix
-AM_CFLAGS+=-Dunix
-endif
-
-if msdos
-AM_CFLAGS+=-D__MSDOS__
-endif
-
+CC_FOR_BUILD = @CC_FOR_BUILD@
+EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 .q.c:
 	@$(top_srcdir)/mkinstalldirs  `dirname $@`
-	./src/language/lexer/q2c $< $@
+	./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
 
-$(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT)
+$(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD)
 all_q_sources =
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
@@ -49,3 +44,7 @@ include $(top_srcdir)/examples/automake.mk
 include $(top_srcdir)/src/automake.mk
 
 include $(top_srcdir)/tests/automake.mk
+
+if WITH_GUI_TOOLS
+include $(top_srcdir)/glade/automake.mk
+endif