X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=e9677386536a96b09fb71d40042f5898857caec9;hb=24a302ed4c0a7fbd52a4a549766c077f9e2bfe37;hp=15624497acf463cefed9b6db0917d1e0a8f845db;hpb=b40f8032efcf6099f665ce8e7c0669bf0e9d655e;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 15624497..e9677386 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -9,6 +9,7 @@ src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
 
 
 src_ui_gui_psppire_LDFLAGS = \
+	$(PSPPIRE_LDFLAGS) \
 	$(PG_LDFLAGS)
 
 
@@ -60,33 +61,44 @@ src_ui_gui_psppire_LDADD = \
 	src/libpspp-core.la \
 	$(GTK_LIBS) \
 	$(GLADE_LIBS) \
-	@LIBINTL@
+	@LIBINTL@ \
+	$(LIB_CLOSE)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
 nodist_src_ui_gui_psppire_DATA = \
-	$(top_srcdir)/src/ui/gui/oneway.ui \
-	$(top_srcdir)/src/ui/gui/rank.ui \
-	$(top_srcdir)/src/ui/gui/recode.ui
+	$(top_builddir)/src/ui/gui/crosstabs.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/syntax-editor.ui
+	$(top_builddir)/src/ui/gui/t-test.ui
 
 EXTRA_DIST += \
+	$(top_srcdir)/src/ui/gui/crosstabs.glade \
+	$(top_srcdir)/src/ui/gui/examine.glade \
+	$(top_srcdir)/src/ui/gui/frequencies.glade \
+	$(top_srcdir)/src/ui/gui/message-dialog.glade \
+	$(top_srcdir)/src/ui/gui/psppire.glade \
 	$(top_srcdir)/src/ui/gui/oneway.glade \
 	$(top_srcdir)/src/ui/gui/rank.glade \
-	$(top_srcdir)/src/ui/gui/recode.glade
+	$(top_srcdir)/src/ui/gui/recode.glade \
+	$(top_srcdir)/src/ui/gui/regression.glade \
+	$(top_srcdir)/src/ui/gui/t-test.glade
 
 dist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/data-editor.glade \
 	$(top_srcdir)/src/ui/gui/descriptives-dialog.glade \
-	$(top_srcdir)/src/ui/gui/examine.glade \
-	$(top_srcdir)/src/ui/gui/crosstabs.glade \
-	$(top_srcdir)/src/ui/gui/frequencies.glade \
-	$(top_srcdir)/src/ui/gui/message-dialog.glade \
 	$(top_srcdir)/src/ui/gui/output-viewer.glade \
-	$(top_srcdir)/src/ui/gui/psppire.glade \
-	$(top_srcdir)/src/ui/gui/regression.glade \
 	$(top_srcdir)/src/ui/gui/syntax-editor.glade \
 	$(top_srcdir)/src/ui/gui/text-data-import.glade \
-	$(top_srcdir)/src/ui/gui/t-test.glade \
 	$(top_srcdir)/src/ui/gui/psppicon.png \
 	$(top_srcdir)/src/ui/gui/pspplogo.png \
 	$(top_srcdir)/src/ui/gui/icons/value-labels.png \
@@ -122,8 +134,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/frequencies-dialog.h \
 	src/ui/gui/goto-case-dialog.c \
 	src/ui/gui/goto-case-dialog.h \
-	src/ui/gui/data-editor.c \
-	src/ui/gui/data-editor.h \
 	src/ui/gui/descriptives-dialog.c \
 	src/ui/gui/descriptives-dialog.h \
 	src/ui/gui/examine-dialog.c \
@@ -145,8 +155,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/missing-val-dialog.h \
         src/ui/gui/oneway-anova-dialog.c \
         src/ui/gui/oneway-anova-dialog.h \
-	src/ui/gui/output-viewer.c \
-	src/ui/gui/output-viewer.h \
 	src/ui/gui/psppire-acr.h \
 	src/ui/gui/psppire-buttonbox.h \
 	src/ui/gui/psppire-hbuttonbox.h \
@@ -178,8 +186,6 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/sort-cases-dialog.h \
 	src/ui/gui/split-file-dialog.c \
 	src/ui/gui/split-file-dialog.h \
-	src/ui/gui/syntax-editor.c \
-	src/ui/gui/syntax-editor.h \
 	src/ui/gui/syntax-editor-source.c \
 	src/ui/gui/syntax-editor-source.h \
 	src/ui/gui/text-data-import-dialog.c \
@@ -206,8 +212,16 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/weight-cases-dialog.h \
 	src/ui/gui/widget-io.c \
 	src/ui/gui/widget-io.h \
-	src/ui/gui/window-manager.c \
-	src/ui/gui/window-manager.h
+	src/ui/gui/psppire-data-window.c \
+	src/ui/gui/psppire-data-window.h \
+	src/ui/gui/psppire-output-window.c \
+	src/ui/gui/psppire-output-window.h \
+	src/ui/gui/psppire-window.c \
+	src/ui/gui/psppire-window.h \
+	src/ui/gui/psppire-window-register.c \
+	src/ui/gui/psppire-window-register.h \
+	src/ui/gui/psppire-syntax-window.c \
+	src/ui/gui/psppire-syntax-window.h
 
 nodist_src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-marshal.c \
@@ -240,4 +254,5 @@ EXTRA_DIST += src/ui/gui/OChangeLog\
 	src/ui/gui/marshaller-list
 
 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
+CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
+	$(nodist_src_ui_gui_psppire_DATA)