Merge branch 'master' into rewrite-sheet

[pspp-builds.git] / lib / gtksheet / automake.mk

diff --git a/lib/gtksheet/automake.mk b/lib/gtksheet/automake.mk
index 150bdaf85a765a292ea9398659a3b3cdbf6f9365..c5a32962add28a2e9494e3c611a0f9dcb2d1db0f 100644 (file)
--- a/lib/gtksheet/automake.mk
+++ b/lib/gtksheet/automake.mk
@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES += lib/gtksheet/libgtksheet.a
 
-lib/gtksheet/%: AM_CFLAGS = $(GTK_CFLAGS) -Wall
+lib_gtksheet_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall
 
 
 lib_gtksheet_libgtksheet_a_SOURCES = \
@@ -23,9 +23,14 @@ lib_gtksheet_libgtksheet_a_SOURCES = \
        lib/gtksheet/gtkextra-marshal.c \
        lib/gtksheet/gtkextra-marshal.h \
        lib/gtksheet/gtkextra-sheet.h \
-       lib/gtksheet/gtkiconlist.c \
-       lib/gtksheet/gtkiconlist.h \
-       lib/gtksheet/gtkitementry.c \
        lib/gtksheet/gtkitementry.h \
+       lib/gtksheet/gtkitementry.c \
+       lib/gtksheet/gtkmarshalers.c \
+       lib/gtksheet/gtkmarshalers.h \
        lib/gtksheet/gtksheet.c \
-       lib/gtksheet/gtksheet.h 
+       lib/gtksheet/gtksheet.h \
+       lib/gtksheet/gtkxpaned.c \
+       lib/gtksheet/gtkxpaned.h
+
+EXTRA_DIST += lib/gtksheet/OChangeLog \
+       lib/gtksheet/README