X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fautomake.mk;h=a85973170588ff26cb1fb8fed4c9f9033c86282e;hb=04a62b3c3fc21cc5d320c9e68cd46642bb309553;hp=0aa3d78494c01feb3106af38a90d8370fa1699b0;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/lib/gtksheet/automake.mk b/lib/gtksheet/automake.mk
index 0aa3d784..a8597317 100644
--- a/lib/gtksheet/automake.mk
+++ b/lib/gtksheet/automake.mk
@@ -2,33 +2,37 @@
 
 noinst_LIBRARIES += lib/gtksheet/libgtksheet.a
 
-lib/gtksheet/%: AM_CPPFLAGS = \
-	-I$(top_builddir)/lib/gtksheet 
+AM_CPPFLAGS += -Ilib
 
-lib/gtksheet/%: AM_CFLAGS = $(GTK_CFLAGS) -Wall
+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/psppire-sheetmodel.c \
+	lib/gtksheet/psppire-gsheetmodel.h \
 	lib/gtksheet/gtkextra-sheet.h \
-	lib/gtksheet/gtkiconlist.c \
-	lib/gtksheet/gtkiconlist.h \
-	lib/gtksheet/gtkitementry.c \
-	lib/gtksheet/gtkitementry.h \
-	lib/gtksheet/gtksheet.c \
-	lib/gtksheet/gtksheet.h 
+	lib/gtksheet/psppire-sheet.c \
+	lib/gtksheet/psppire-sheet.h \
+	lib/gtksheet/gtkxpaned.c \
+	lib/gtksheet/gtkxpaned.h \
+	lib/gtksheet/psppire-axis.c \
+	lib/gtksheet/psppire-axis.h \
+	lib/gtksheet/psppire-axis-impl.c \
+	lib/gtksheet/psppire-axis-impl.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)