X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=806fc2a9768ae596613e1afebcdf2ec951e0bebb;hb=3d161b40e72009aeca4bfc1cb8be82d05d7e6e2a;hp=dd3b1cb80e2273004b1268a5686da6ed31719e8e;hpb=1d2780996f3f615c2ea19ddfc1c9e1592fa64b70;p=pspp-builds.git

diff --git a/Makefile.am b/Makefile.am
index dd3b1cb8..806fc2a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-AUTOMAKE_OPTIONS = gnits 1.7 subdir-objects
+AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
 
-SUBDIRS = intl gl po
-DISTCLEANFILES = ./intl/plural.c ./po/stamp-po
+SUBDIRS = gl po
+DISTCLEANFILES = ./po/stamp-po xconfigure 
 BUILT_SOURCES =
 
-AM_CPPFLAGS=-I$(top_srcdir)/intl -I$(top_srcdir)/gl -I$(top_builddir)/gl
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl
 
 AM_CFLAGS=
 
@@ -15,19 +15,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 $< $@
+	@$(MKDIR_P) `dirname $@`
+	./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 +43,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