Applied patch file #10344.

[pspp] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 5365451c342286b18bc99cc7716b3680e54ecc52..4fc694ac171e48a3c964f211a9c21e48cfabe0f0 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS += src/ui/gui/psppire
 
-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 
@@ -10,18 +10,25 @@ 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/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/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/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 = \
@@ -38,8 +45,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 \
@@ -50,6 +57,8 @@ 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 \