X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fautomake.mk;h=7c52887bf884d773171c4b5d3f9fb2e41be6bb44;hb=72147c12357446b304264b6944b8a1d92c45f53c;hp=64b4928468c2e84521fb71313e346e8386e9ec66;hpb=1de0159c28b93fdb2f2caac74e13dccbaee00822;p=pspp-builds.git

diff --git a/src/automake.mk b/src/automake.mk
index 64b49284..7c52887b 100644
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -2,24 +2,12 @@
 
 # PSPP
 
-include $(top_srcdir)/src/ui/terminal/automake.mk
 include $(top_srcdir)/src/math/automake.mk
 include $(top_srcdir)/src/libpspp/automake.mk
 include $(top_srcdir)/src/data/automake.mk
 include $(top_srcdir)/src/output/automake.mk
 include $(top_srcdir)/src/language/automake.mk
 
-if WITHGUI
-include $(top_srcdir)/src/ui/gui/automake.mk
-endif
-
-AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
-
-src/procedure.o: AM_CPPFLAGS += \
- -I$(top_srcdir)/src/language \
- -I$(top_srcdir)/src/language/control \
- -I$(top_srcdir)/src/output \
- -I$(top_srcdir)/src/data \
- -I$(top_srcdir)/src/libpspp
-
+include $(top_srcdir)/src/ui/automake.mk
 
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/lib -DPKGDATADIR=\"$(pkgdatadir)\"