Include gtk-builder-convert to process .glade files

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 92acbd69409776f1cb2e092d0e7892ad5dcc162f..9246b79fa99d2136322dd69667e52dbe1ec17b41 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -4,7 +4,7 @@ include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
 bin_PROGRAMS += src/ui/gui/psppire 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall \
        -DINSTALLDIR=\"$(bindir)\" -DGDK_MULTIHEAD_SAFE=1
 
 
@@ -27,7 +27,6 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
-       $(GLADE_LIBS) \
        @LIBINTL@ \
        $(LIB_CLOSE)
 
@@ -74,7 +73,6 @@ nodist_src_ui_gui_psppire_DATA = \
        $(top_builddir)/src/ui/gui/t-test.ui
 
 dist_src_ui_gui_psppire_DATA = \
-       $(top_srcdir)/src/ui/gui/text-data-import.glade \
        $(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\
@@ -139,6 +137,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire.h \
        src/ui/gui/psppire-acr.h \
        src/ui/gui/psppire-buttonbox.h \
+       src/ui/gui/psppire-conf.c \
+       src/ui/gui/psppire-conf.h \
        src/ui/gui/psppire-data-editor.c \
        src/ui/gui/psppire-data-editor.h \
        src/ui/gui/psppire-data-store.c \
@@ -219,6 +219,7 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/recode.glade \
        src/ui/gui/regression.glade \
        src/ui/gui/syntax-editor.glade \
+       src/ui/gui/text-data-import.glade \
        src/ui/gui/t-test.glade
 
 
@@ -248,12 +249,18 @@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
        glib-genmarshal --header --prefix=psppire_marshal $< > $@
 
 .glade.ui:
-       gtk-builder-convert $< $@
+       $(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@
+
+desktopdir = $(datadir)/applications
+desktop_DATA = src/ui/gui/pspp.desktop
 
 EXTRA_DIST += src/ui/gui/OChangeLog\
        src/ui/gui/psppicon.png \
-       src/ui/gui/marshaller-list
+       src/ui/gui/marshaller-list \
+       $(desktop_DATA)
 
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
        $(nodist_src_ui_gui_psppire_DATA)
+
+