X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=f2f0b813b8c83cf9256f0dfcceb5df47c09a41e5;hb=fd0c595927a23ea0373551a1eed4570388ea0fc5;hp=f14ca3ac62c0d5609c2abb1c08a789c4871d9295;hpb=b40553085a85914b85d32c483faf185ad6b39589;p=pspp-builds.git

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index f14ca3ac..f2f0b813 100644
--- 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)
 
@@ -63,6 +63,7 @@ UI_FILES = \
 	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 \
@@ -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 \
@@ -244,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 $< $@