New module psppire-var-view

[pspp-builds.git] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index bf168f997f6e2eb5ed99e8daf55f2fe966b48806..f2f0b813b8c83cf9256f0dfcceb5df47c09a41e5 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -26,7 +26,7 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
-       @LIBINTL@
+       $(LIBINTL)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -46,7 +46,7 @@ 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)
 
@@ -61,7 +61,9 @@ UI_FILES = \
        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 \
@@ -72,7 +74,6 @@ UI_FILES = \
 
 nodist_src_ui_gui_psppire_DATA = \
        $(top_builddir)/src/ui/gui/data-editor.ui \
-       $(top_builddir)/src/ui/gui/psppire.ui \
        $(top_builddir)/src/ui/gui/output-viewer.ui \
        $(top_builddir)/src/ui/gui/syntax-editor.ui
 
@@ -162,6 +163,8 @@ src_ui_gui_psppire_SOURCES = \
        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 \
@@ -219,7 +222,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/widgets.c \
        src/ui/gui/widgets.h \
        src/ui/gui/data-editor.glade \
-       src/ui/gui/psppire.glade \
        src/ui/gui/output-viewer.glade \
        src/ui/gui/syntax-editor.glade
 
@@ -245,11 +247,12 @@ AM_CPPFLAGS += -Isrc
 
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
        echo '#include <config.h>' > $@
-       glib-genmarshal --body --prefix=psppire_marshal $< >> $@
+       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:
        $(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@