X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgtksheet%2Fautomake.mk;h=1ad14a7f63ef360bd223a88cf0b6533434b4c9e8;hb=44505c68f8350309ab81a0c1915413876968e5e8;hp=b28382602d437c7f646872a6502dbb0724c17e96;hpb=8e0b8a1517ede1662d735f08b7c573f23bd41c2c;p=pspp-builds.git

diff --git a/lib/gtksheet/automake.mk b/lib/gtksheet/automake.mk
index b2838260..1ad14a7f 100644
--- a/lib/gtksheet/automake.mk
+++ b/lib/gtksheet/automake.mk
@@ -2,31 +2,39 @@
 
 noinst_LIBRARIES += lib/gtksheet/libgtksheet.a
 
-lib_gtksheet_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall
+AM_CPPFLAGS += -Ilib
 
+lib_gtksheet_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+
+nodist_lib_gtksheet_libgtksheet_a_SOURCES = \
+	lib/gtksheet/psppire-marshal.c \
+	lib/gtksheet/psppire-marshal.h
 
 lib_gtksheet_libgtksheet_a_SOURCES = \
-	lib/gtksheet/gsheet-column-iface.c \
-	lib/gtksheet/gsheet-column-iface.h \
-	lib/gtksheet/gsheet-hetero-column.c \
-	lib/gtksheet/gsheet-hetero-column.h \
 	lib/gtksheet/gsheetmodel.c \
 	lib/gtksheet/gsheetmodel.h \
-	lib/gtksheet/gsheet-row-iface.c \
-	lib/gtksheet/gsheet-row-iface.h \
-	lib/gtksheet/gsheet-uniform-column.c \
-	lib/gtksheet/gsheet-uniform-column.h \
-	lib/gtksheet/gsheet-uniform-row.c \
-	lib/gtksheet/gsheet-uniform-row.h \
-	lib/gtksheet/gtkextra.c \
-	lib/gtksheet/gtkextrafeatures.h \
-	lib/gtksheet/gtkextra-marshal.c \
-	lib/gtksheet/gtkextra-marshal.h \
 	lib/gtksheet/gtkextra-sheet.h \
-	lib/gtksheet/gtkitementry.h \
-	lib/gtksheet/gtkitementry.c \
 	lib/gtksheet/gtksheet.c \
-	lib/gtksheet/gtksheet.h 
+	lib/gtksheet/gtksheet.h \
+	lib/gtksheet/gtkxpaned.c \
+	lib/gtksheet/gtkxpaned.h \
+	lib/gtksheet/psppire-axis.c \
+	lib/gtksheet/psppire-axis.h \
+	lib/gtksheet/psppire-axis-hetero.c \
+	lib/gtksheet/psppire-axis-hetero.h \
+	lib/gtksheet/psppire-axis-uniform.c \
+	lib/gtksheet/psppire-axis-uniform.h 
+
 
 EXTRA_DIST += lib/gtksheet/OChangeLog \
+	lib/gtksheet/marshaller-list \
 	lib/gtksheet/README
+
+lib/gtksheet/psppire-marshal.c: lib/gtksheet/marshaller-list
+	glib-genmarshal --body --prefix=psppire_marshal $< > $@
+
+lib/gtksheet/psppire-marshal.h: lib/gtksheet/marshaller-list
+	glib-genmarshal --header --prefix=psppire_marshal $< > $@
+
+BUILT_SOURCES += $(nodist_lib_gtksheet_libgtksheet_a_SOURCES)
+CLEANFILES += $(nodist_lib_gtksheet_libgtksheet_a_SOURCES)