X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=be59fed55165d323656e08978b3e77e7b84a9f6f;hb=57b436a22d9ae0e395fb2e3ce101c2b5c2e6939e;hp=545e9345217f45bd93ae541d9428063b12eba33a;hpb=35cb4610fd9a7e9f720a07dadfde944339bfeb21;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 545e9345..be59fed5 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -2,16 +2,7 @@
 
 bin_PROGRAMS += src/ui/gui/psppire
 
-src/ui/gui/%: AM_CPPFLAGS += \
-	-export-dynamic \
-	-I$(top_srcdir)/gl \
-	-I$(top_srcdir)/lib/gtksheet \
-	-I$(top_srcdir)/src/libpspp \
-	-I$(top_srcdir)/src/data \
-	-I$(top_srcdir)/src/ui/gui 
-
-
-src/ui/gui/%: AM_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
 
 src_ui_gui_psppire_LDFLAGS = \
 	-export-dynamic 
@@ -19,11 +10,27 @@ src_ui_gui_psppire_LDFLAGS = \
 src_ui_gui_psppire_LDADD = \
 	$(GTK_LIBS) \
 	$(GLADE_LIBS) \
-	-lgtksheet -L$(top_builddir)/lib/gtksheet \
-	-ldata -L$(top_builddir)/src/data \
-	-lpspp -L$(top_builddir)/src/libpspp \
-	 -lgl -L$(top_builddir)/gl    \
-	 @LIBINTL@ @LIBREADLINE@
+	$(top_builddir)/lib/gtksheet/libgtksheet.a \
+	$(top_builddir)/src/ui/libuicommon.a \
+	$(top_builddir)/src/math/libpspp_math.a \
+	$(top_builddir)/src/data/libdata.a \
+	$(top_builddir)/src/libpspp/libpspp.a \
+	$(top_builddir)/gl/libgl.a \
+	@LIBINTL@ @LIBREADLINE@
+
+src_ui_gui_psppiredir = $(pkgdatadir)
+
+dist_src_ui_gui_psppire_DATA = \
+	$(top_srcdir)/src/ui/gui/psppire.glade \
+	$(top_srcdir)/src/ui/gui/psppicon.png \
+	$(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\
+	$(top_srcdir)/src/ui/gui/icons/insert-case.png \
+	$(top_srcdir)/src/ui/gui/icons/insert-variable.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
 
 
 src_ui_gui_psppire_SOURCES = \
@@ -40,8 +47,8 @@ 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-case-array.c \
-	src/ui/gui/psppire-case-array.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 \
@@ -52,12 +59,11 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-variable.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/val-labs-dialog.c \
 	src/ui/gui/val-labs-dialog.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/var-type-dialog.h