X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=22e2350b5156cfd02d2e198abdde130dd5d9175a;hb=bb025f49673d66a2e490a781d7d59b2f32da0087;hp=cd7c34e6cac90d8df925cbd1331a74e204c301dd;hpb=7fbfc32fc3c636959b0a25b3e76609f86519e84a;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index cd7c34e6..22e2350b 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 = \
@@ -29,7 +26,7 @@ src_ui_gui_psppire_LDADD = \
 	src/libpspp.la \
 	src/libpspp-core.la \
 	$(GTK_LIBS) \
-	@LIBINTL@
+	$(LIBINTL)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -49,35 +46,41 @@ INSTALL_DATA_HOOKS += install-icons
 
 uninstall-icons:
 	for size in 16x16 ; do \
-          $(RM) $(themedir)/$$size/$(context)/psppicon.png ; \
+          rm -f $(themedir)/$$size/$(context)/psppicon.png ; \
 	done 
 	gtk-update-icon-cache --ignore-theme-index $(themedir)
 
 UNINSTALL_DATA_HOOKS += uninstall-icons
 
 
+UI_FILES = \
+	src/ui/gui/crosstabs.ui \
+	src/ui/gui/descriptives.ui \
+	src/ui/gui/examine.ui \
+	src/ui/gui/find.ui \
+	src/ui/gui/frequencies.ui \
+	src/ui/gui/message-dialog.ui \
+	src/ui/gui/oneway.ui \
+	src/ui/gui/psppire.ui \
+	src/ui/gui/rank.ui \
+	src/ui/gui/sort.ui \
+	src/ui/gui/recode.ui \
+	src/ui/gui/regression.ui \
+	src/ui/gui/reliability.ui \
+	src/ui/gui/roc.ui \
+	src/ui/gui/t-test.ui \
+	src/ui/gui/text-data-import.ui \
+	src/ui/gui/var-sheet-dialogs.ui \
+	src/ui/gui/variable-info.ui
+
 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/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/syntax-editor.ui
 
 
 dist_src_ui_gui_psppire_DATA = \
+	$(UI_FILES) \
 	$(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\
@@ -123,6 +126,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 \
@@ -159,6 +164,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-keypad.h \
 	src/ui/gui/psppire-output-window.c \
 	src/ui/gui/psppire-output-window.h \
+	src/ui/gui/psppire-var-view.c \
+	src/ui/gui/psppire-var-view.h \
 	src/ui/gui/psppire-selector.h \
 	src/ui/gui/psppire-syntax-window.c \
 	src/ui/gui/psppire-syntax-window.h \
@@ -181,6 +188,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/regression-dialog.h \
 	src/ui/gui/reliability-dialog.c \
 	src/ui/gui/reliability-dialog.h \
+	src/ui/gui/roc-dialog.c \
+	src/ui/gui/roc-dialog.h \
 	src/ui/gui/select-cases-dialog.c \
 	src/ui/gui/select-cases-dialog.h \
 	src/ui/gui/sort-cases-dialog.c \
@@ -215,24 +224,9 @@ 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/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/syntax-editor.glade
 
 
 nodist_src_ui_gui_psppire_SOURCES = \
@@ -256,11 +250,12 @@ AM_CPPFLAGS += -Isrc
 
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 	echo '#include <config.h>' > $@
-	glib-genmarshal --body --prefix=psppire_marshal $< >> $@
+	glib-genmarshal --body --prefix=psppire_marshal $? >> $@
 
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
-	glib-genmarshal --header --prefix=psppire_marshal $< > $@
+	glib-genmarshal --header --prefix=psppire_marshal $? > $@
 
+SUFFIXES += .glade .ui
 .glade.ui:
 	$(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@