X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgtksheet%2Fautomake.mk;h=a96c25d8be6760eab3ec4dcaa50f6d622a33eca3;hb=179ec0710b05fb6e52075fca3b89bbc72aa6efb8;hp=550af2eb3a5ce00ab21e9822700d0f1deef55337;hpb=5eabbd1a129cd18e0dcd5a077b187ea9c5a8a917;p=pspp-builds.git

diff --git a/lib/gtksheet/automake.mk b/lib/gtksheet/automake.mk
index 550af2eb..a96c25d8 100644
--- a/lib/gtksheet/automake.mk
+++ b/lib/gtksheet/automake.mk
@@ -2,39 +2,22 @@
 
 noinst_LIBRARIES += lib/gtksheet/libgtksheet.a
 
-AM_CPPFLAGS += -Ilib
-
 lib_gtksheet_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
-lib_gtksheet_BUILT_SOURCES = \
-	lib/gtksheet/psppire-marshal.c \
-	lib/gtksheet/psppire-marshal.h
-
 lib_gtksheet_libgtksheet_a_SOURCES = \
-	lib/gtksheet/gsheetmodel.c \
-	lib/gtksheet/gsheetmodel.h \
+	lib/gtksheet/psppire-sheetmodel.c \
+	lib/gtksheet/psppire-sheetmodel.h \
 	lib/gtksheet/gtkextra-sheet.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-hetero.c \
-	lib/gtksheet/psppire-axis-hetero.h \
-	lib/gtksheet/psppire-axis-uniform.c \
-	lib/gtksheet/psppire-axis-uniform.h \
-	$(lib_gtksheet_BUILT_SOURCES)
+	lib/gtksheet/psppire-axis-impl.c \
+	lib/gtksheet/psppire-axis-impl.h 
 
 
-CLEANFILES += $(lib_gtksheet_BUILT_SOURCES)
-
 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 $< > $@