X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=f2f0b813b8c83cf9256f0dfcceb5df47c09a41e5;hb=fd0c595927a23ea0373551a1eed4570388ea0fc5;hp=92acbd69409776f1cb2e092d0e7892ad5dcc162f;hpb=12fc15c56844de1492c4ee31cbb12a54b37cfc2e;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 92acbd69..f2f0b813 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -4,8 +4,7 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
 bin_PROGRAMS += src/ui/gui/psppire 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
-	-DINSTALLDIR=\"$(bindir)\" -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -27,9 +26,7 @@ src_ui_gui_psppire_LDADD = \
 	src/libpspp.la \
 	src/libpspp-core.la \
 	$(GTK_LIBS) \
-	$(GLADE_LIBS) \
-	@LIBINTL@ \
-	$(LIB_CLOSE)
+	$(LIBINTL)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -49,32 +46,40 @@ 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/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/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/syntax-editor.ui
+
 
 dist_src_ui_gui_psppire_DATA = \
-	$(top_srcdir)/src/ui/gui/text-data-import.glade \
+	$(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\
@@ -116,10 +121,12 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/descriptives-dialog.h \
 	src/ui/gui/dialog-common.c \
 	src/ui/gui/dialog-common.h \
-	src/ui/gui/dict-display.c \
 	src/ui/gui/dict-display.h \
+	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 \
@@ -139,6 +146,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire.h \
 	src/ui/gui/psppire-acr.h \
 	src/ui/gui/psppire-buttonbox.h \
+	src/ui/gui/psppire-conf.c \
+	src/ui/gui/psppire-conf.h \
 	src/ui/gui/psppire-data-editor.c \
 	src/ui/gui/psppire-data-editor.h \
 	src/ui/gui/psppire-data-store.c \
@@ -148,10 +157,14 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-dialog.h \
 	src/ui/gui/psppire-dict.c \
 	src/ui/gui/psppire-dict.h \
+	src/ui/gui/psppire-dictview.c \
+	src/ui/gui/psppire-dictview.h \
 	src/ui/gui/psppire-hbuttonbox.h \
 	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 \
@@ -172,6 +185,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/recode-dialog.h \
 	src/ui/gui/regression-dialog.c \
 	src/ui/gui/regression-dialog.h \
+	src/ui/gui/reliability-dialog.c \
+	src/ui/gui/reliability-dialog.h \
 	src/ui/gui/select-cases-dialog.c \
 	src/ui/gui/select-cases-dialog.h \
 	src/ui/gui/sort-cases-dialog.c \
@@ -206,20 +221,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/syntax-editor.glade \
-	src/ui/gui/t-test.glade
+	src/ui/gui/syntax-editor.glade
 
 
 nodist_src_ui_gui_psppire_SOURCES = \
@@ -242,18 +246,26 @@ PHONY += yelp-check
 AM_CPPFLAGS += -Isrc
 
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
-	glib-genmarshal --body --prefix=psppire_marshal $< > $@
+	echo '#include <config.h>' > $@
+	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:
-	gtk-builder-convert $< $@
+	$(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@
+
+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
+	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)
+
+