X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=314ae3598f72570cb9525f12a156167426bd035b;hb=b06c888cf2e8c126b04d4678120439533a5086e5;hp=11a27925ddba9c5a7663ac36d1f448f4acd87144;hpb=09a1109ddc398f36fe720208e1d38053850cbd2a;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 11a27925..314ae359 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,59 +56,87 @@ 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
+	$(top_srcdir)/src/ui/gui/icons/weight-cases.png \
+	$(top_srcdir)/src/ui/gui/icons/16x16/nominal.png  \
+	$(top_srcdir)/src/ui/gui/icons/16x16/ordinal.png \
+	$(top_srcdir)/src/ui/gui/icons/16x16/scale.png \
+	$(top_srcdir)/src/ui/gui/icons/16x16/string.png \
+	$(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \
+	$(top_srcdir)/src/ui/gui/icons/splash.png
 
 
 src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/about.c \
 	src/ui/gui/about.h \
+	src/ui/gui/compute-dialog.c \
+	src/ui/gui/compute-dialog.h \
 	src/ui/gui/customentry.c \
 	src/ui/gui/customentry.h \
 	src/ui/gui/data-sheet.c \
 	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 \
 	src/ui/gui/flexifile-factory.c \
+	src/ui/gui/main.c \
 	src/ui/gui/message-dialog.c \
 	src/ui/gui/message-dialog.h \
 	src/ui/gui/psppire.c \
+	src/ui/gui/psppire.h \
 	src/ui/gui/helper.c \
 	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-hbuttonbox.c \
+	src/ui/gui/psppire-hbuttonbox.h \
+	src/ui/gui/psppire-vbuttonbox.c \
+	src/ui/gui/psppire-vbuttonbox.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-object.c \
-	src/ui/gui/psppire-object.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/psppire-var-select.h \
-	src/ui/gui/psppire-var-select.c \
 	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 \
 	src/ui/gui/syntax-editor-source.h \
+	src/ui/gui/transpose-dialog.c \
+	src/ui/gui/transpose-dialog.h \
 	src/ui/gui/val-labs-dialog.c \
 	src/ui/gui/val-labs-dialog.h \
+	src/ui/gui/var-display.c \
+	src/ui/gui/var-display.h \
 	src/ui/gui/var-sheet.c \
 	src/ui/gui/var-sheet.h \
 	src/ui/gui/var-type-dialog.c \
 	src/ui/gui/var-type-dialog.h \
+	src/ui/gui/variable-info-dialog.c \
+	src/ui/gui/variable-info-dialog.h \
 	src/ui/gui/weight-cases-dialog.c \
 	src/ui/gui/weight-cases-dialog.h \
 	src/ui/gui/window-manager.c \
 	src/ui/gui/window-manager.h
 
+