Rename lib/gtksheet to lib/gtk-contrib

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index ee824660b491ada89fdb8238f90998271506e2bf..57d9163ce120ba84b9ef943f44ce48b7540a0e8b 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
+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 \
@@ -10,7 +12,6 @@ src_ui_gui_psppire_LDFLAGS = \
        $(PG_LDFLAGS)
 
 
-
 if RELOCATABLE_VIA_LD
 src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 else
@@ -52,7 +53,8 @@ src_ui_gui_libpsppire_la_SOURCES = \
 src_ui_gui_psppire_LDADD = \
        -dlopen src/ui/gui/libpsppire.la \
        src/ui/gui/libpsppwidgets.la \
-       lib/gtksheet/libgtksheet.a \
+        src/ui/gui/sheet/libsheet.la \
+       lib/gtk-contrib/libgtksheet.a \
        src/ui/libuicommon.la \
        src/libpspp.la \
        src/libpspp-core.la \
@@ -200,6 +202,13 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/window-manager.c \
        src/ui/gui/window-manager.h
 
+nodist_src_ui_gui_psppire_SOURCES = \
+       src/ui/gui/psppire-marshal.c \
+       src/ui/gui/psppire-marshal.h
+
+
+
+
 yelp-check:
        @if ! yelp --version > /dev/null 2>&1 ; then \
                echo    ; \
@@ -211,4 +220,16 @@ yelp-check:
        fi
 PHONY += yelp-check
 
-EXTRA_DIST += src/ui/gui/OChangeLog
+AM_CPPFLAGS += -Isrc
+
+src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
+       glib-genmarshal --body --prefix=psppire_marshal $< > $@
+
+src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
+       glib-genmarshal --header --prefix=psppire_marshal $< > $@
+
+EXTRA_DIST += src/ui/gui/OChangeLog\
+       src/ui/gui/marshaller-list
+
+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