X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=d312e16fba4002794553f6d861cd7dc8989e805e;hb=91946022cdf4716dee3d802dd9827169cf995912;hp=7c06b8e47bf33c5811f4ea486d7e27454499f47d;hpb=c3580361c52f0246f71d9b727cb9e5bd0d8497bb;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 7c06b8e4..d312e16f 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -2,6 +2,37 @@
 
 include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
+UI_FILES = \
+	src/ui/gui/correlation.ui \
+	src/ui/gui/crosstabs.ui \
+	src/ui/gui/descriptives.ui \
+	src/ui/gui/examine.ui \
+	src/ui/gui/factor.ui \
+	src/ui/gui/find.ui \
+	src/ui/gui/frequencies.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 \
+	src/ui/gui/data-editor.glade \
+	src/ui/gui/output-viewer.glade \
+	src/ui/gui/syntax-editor.glade
+
+EXTRA_DIST += \
+	src/ui/gui/OChangeLog \
+	src/ui/gui/psppicon.png \
+	src/ui/gui/marshaller-list \
+	src/ui/gui/pspp.desktop
+
+if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
 
 src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
@@ -26,6 +57,7 @@ src_ui_gui_psppire_LDADD = \
 	src/libpspp.la \
 	src/libpspp-core.la \
 	$(GTK_LIBS) \
+	$(CAIRO_LIBS) \
 	$(LIBINTL)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
@@ -52,25 +84,6 @@ uninstall-icons:
 
 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/recode.ui \
-	src/ui/gui/regression.ui \
-	src/ui/gui/reliability.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/data-editor.ui \
 	$(top_builddir)/src/ui/gui/output-viewer.ui \
@@ -112,6 +125,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/comments-dialog.h \
 	src/ui/gui/compute-dialog.c \
 	src/ui/gui/compute-dialog.h \
+	src/ui/gui/correlation-dialog.c \
+	src/ui/gui/correlation-dialog.h \
 	src/ui/gui/crosstabs-dialog.c \
 	src/ui/gui/crosstabs-dialog.h \
 	src/ui/gui/customentry.c \
@@ -128,6 +143,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/executor.h \
 	src/ui/gui/find-dialog.c \
 	src/ui/gui/find-dialog.h \
+	src/ui/gui/factor-dialog.c \
+	src/ui/gui/factor-dialog.h \
 	src/ui/gui/frequencies-dialog.c \
 	src/ui/gui/frequencies-dialog.h \
 	src/ui/gui/goto-case-dialog.c \
@@ -135,8 +152,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/helper.c \
 	src/ui/gui/helper.h \
 	src/ui/gui/main.c \
-	src/ui/gui/message-dialog.c \
-	src/ui/gui/message-dialog.h \
 	src/ui/gui/missing-val-dialog.c \
 	src/ui/gui/missing-val-dialog.h \
         src/ui/gui/oneway-anova-dialog.c \
@@ -162,7 +177,11 @@ 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-select-dest.c \
+	src/ui/gui/psppire-select-dest.h \
 	src/ui/gui/psppire-syntax-window.c \
 	src/ui/gui/psppire-syntax-window.h \
 	src/ui/gui/psppire-var-ptr.c \
@@ -184,6 +203,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 \
@@ -217,11 +238,7 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/widget-io.c \
 	src/ui/gui/widget-io.h \
 	src/ui/gui/widgets.c \
-	src/ui/gui/widgets.h \
-	src/ui/gui/data-editor.glade \
-	src/ui/gui/output-viewer.glade \
-	src/ui/gui/syntax-editor.glade
-
+	src/ui/gui/widgets.h
 
 nodist_src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-marshal.c \
@@ -244,10 +261,10 @@ 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:
@@ -256,13 +273,7 @@ SUFFIXES += .glade .ui
 desktopdir = $(datadir)/applications
 desktop_DATA = src/ui/gui/pspp.desktop
 
-EXTRA_DIST += src/ui/gui/OChangeLog\
-	src/ui/gui/psppicon.png \
-	src/ui/gui/marshaller-list \
-	$(desktop_DATA)
-
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
 	$(nodist_src_ui_gui_psppire_DATA)
-
-
+endif HAVE_GUI