X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=e8da4c4d9793f9d32c76add582db4d934b8b913b;hb=7eda1a159f93609f8bd68e98e1b04db2d99067f5;hp=6f6fa3c52c7ea2e5e67339bcd4d816803165f442;hpb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 6f6fa3c5..e8da4c4d 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -4,12 +4,20 @@
 
 bin_PROGRAMS += src/ui/gui/psppire 
 
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
+	-DINSTALLDIR=\"$(bindir)\"
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
 
 src_ui_gui_psppire_LDFLAGS = \
-	-export-dynamic \
-	-rpath $(pkglibdir)
+	-export-dynamic 
+
+
+if RELOCATABLE_VIA_LD
+src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+else
+src_ui_gui_psppire_LDFLAGS += -rpath $(pkglibdir)
+endif
+
 
 pkglib_LTLIBRARIES = src/ui/gui/libpsppire.la
 
@@ -48,6 +56,7 @@ dist_src_ui_gui_psppire_DATA = \
 	$(top_srcdir)/src/ui/gui/icons/goto-variable.png\
 	$(top_srcdir)/src/ui/gui/icons/insert-case.png \
 	$(top_srcdir)/src/ui/gui/icons/insert-variable.png \
+	$(top_srcdir)/src/ui/gui/icons/recent-dialogs.png \
 	$(top_srcdir)/src/ui/gui/icons/split-file.png \
 	$(top_srcdir)/src/ui/gui/icons/select-cases.png \
 	$(top_srcdir)/src/ui/gui/icons/weight-cases.png
@@ -62,6 +71,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/data-sheet.h \
 	src/ui/gui/data-editor.c \
 	src/ui/gui/data-editor.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/flexifile-factory.h \
@@ -73,22 +84,26 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/helper.h \
 	src/ui/gui/missing-val-dialog.c \
 	src/ui/gui/missing-val-dialog.h \
+	src/ui/gui/psppire-buttonbox.c \
+	src/ui/gui/psppire-buttonbox.h \
 	src/ui/gui/psppire-case-file.c \
 	src/ui/gui/psppire-case-file.h \
 	src/ui/gui/psppire-data-store.c \
 	src/ui/gui/psppire-data-store.h \
-	src/ui/gui/psppire-dict.c \
-	src/ui/gui/psppire-dict.h \
 	src/ui/gui/psppire-dialog.c \
 	src/ui/gui/psppire-dialog.h \
-	src/ui/gui/psppire-buttonbox.c \
-	src/ui/gui/psppire-buttonbox.h \
+	src/ui/gui/psppire-dict.c \
+	src/ui/gui/psppire-dict.h \
+	src/ui/gui/psppire-keypad.c \
+	src/ui/gui/psppire-keypad.h \
 	src/ui/gui/psppire-selector.c \
 	src/ui/gui/psppire-selector.h \
 	src/ui/gui/psppire-var-store.c \
 	src/ui/gui/psppire-var-store.h \
 	src/ui/gui/sort-cases-dialog.c \
 	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 \
@@ -106,3 +121,4 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/window-manager.c \
 	src/ui/gui/window-manager.h
 
+