X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=77ad7f5a8f3992b71cafdf93a427f76d6e0d6846;hb=86166f73821142c2f82fdace3ac40a0933989dcd;hp=ce3d664cab4b643f66015b46a2b74120ae822f71;hpb=eb57e0a1240f2b528d27e9662b8b4e2310b7bcb7;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index ce3d664c..77ad7f5a 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -4,10 +4,7 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
 bin_PROGRAMS += src/ui/gui/psppire 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \
-	-DINSTALLDIR=\"$(bindir)\"  \
-	-DDOCDIR=\"$(docdir)\"  \
-	-DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -57,28 +54,28 @@ UNINSTALL_DATA_HOOKS += uninstall-icons
 
 
 nodist_src_ui_gui_psppire_DATA = \
-	$(top_builddir)/src/ui/gui/crosstabs.ui \
-	$(top_builddir)/src/ui/gui/descriptives-dialog.ui \
 	$(top_builddir)/src/ui/gui/data-editor.ui \
-	$(top_builddir)/src/ui/gui/examine.ui \
-	$(top_builddir)/src/ui/gui/find.ui \
-	$(top_builddir)/src/ui/gui/frequencies.ui \
 	$(top_builddir)/src/ui/gui/message-dialog.ui \
 	$(top_builddir)/src/ui/gui/psppire.ui \
 	$(top_builddir)/src/ui/gui/oneway.ui \
 	$(top_builddir)/src/ui/gui/output-viewer.ui \
-	$(top_builddir)/src/ui/gui/rank.ui \
-	$(top_builddir)/src/ui/gui/recode.ui \
 	$(top_builddir)/src/ui/gui/regression.ui \
 	$(top_builddir)/src/ui/gui/reliability.ui \
 	$(top_builddir)/src/ui/gui/syntax-editor.ui \
 	$(top_builddir)/src/ui/gui/text-data-import.ui \
 	$(top_builddir)/src/ui/gui/t-test.ui \
-	$(top_builddir)/src/ui/gui/var-sheet-dialogs.ui \
-	$(top_builddir)/src/ui/gui/variable-info-dialog.ui
+	$(top_builddir)/src/ui/gui/var-sheet-dialogs.ui
 
 
 dist_src_ui_gui_psppire_DATA = \
+	$(top_srcdir)/src/ui/gui/crosstabs.ui \
+	$(top_srcdir)/src/ui/gui/descriptives.ui \
+	$(top_srcdir)/src/ui/gui/examine.ui \
+	$(top_srcdir)/src/ui/gui/find.ui \
+	$(top_srcdir)/src/ui/gui/frequencies.ui \
+	$(top_srcdir)/src/ui/gui/rank.ui \
+	$(top_srcdir)/src/ui/gui/recode.ui \
+	$(top_srcdir)/src/ui/gui/variable-info.ui \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
 	$(top_srcdir)/src/ui/gui/icons/goto-variable.png\
@@ -124,6 +121,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/dict-display.c \
 	src/ui/gui/examine-dialog.c \
 	src/ui/gui/examine-dialog.h \
+	src/ui/gui/executor.c \
+	src/ui/gui/executor.h \
 	src/ui/gui/find-dialog.c \
 	src/ui/gui/find-dialog.h \
 	src/ui/gui/frequencies-dialog.c \
@@ -216,25 +215,17 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/widget-io.h \
 	src/ui/gui/widgets.c \
 	src/ui/gui/widgets.h \
-	src/ui/gui/crosstabs.glade \
-	src/ui/gui/descriptives-dialog.glade \
 	src/ui/gui/data-editor.glade \
-	src/ui/gui/examine.glade \
-	src/ui/gui/find.glade \
-	src/ui/gui/frequencies.glade \
 	src/ui/gui/message-dialog.glade \
 	src/ui/gui/psppire.glade \
 	src/ui/gui/oneway.glade \
 	src/ui/gui/output-viewer.glade \
-	src/ui/gui/rank.glade \
-	src/ui/gui/recode.glade \
 	src/ui/gui/regression.glade \
 	src/ui/gui/reliability.glade \
 	src/ui/gui/syntax-editor.glade \
 	src/ui/gui/text-data-import.glade \
 	src/ui/gui/t-test.glade \
-	src/ui/gui/var-sheet-dialogs.glade \
-	src/ui/gui/variable-info-dialog.glade
+	src/ui/gui/var-sheet-dialogs.glade
 
 
 nodist_src_ui_gui_psppire_SOURCES = \