Merge 'master' into 'psppsheet'.

[pspp] / lib / gtk-contrib / automake.mk

diff --git a/lib/gtk-contrib/automake.mk b/lib/gtk-contrib/automake.mk
index f3cd96e21a89437508f54e2678d186c246300bd6..e28c4933cd83cdf2c5f7581911a14e2bc6a1a857 100644 (file)
--- a/lib/gtk-contrib/automake.mk
+++ b/lib/gtk-contrib/automake.mk
@@ -1,17 +1,13 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-noinst_LIBRARIES += lib/gtk-contrib/libgtksheet.a
+noinst_LIBRARIES += lib/gtk-contrib/libxpaned.a
 
-lib_gtk_contrib_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+lib_gtk_contrib_libxpaned_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
-lib_gtk_contrib_libgtksheet_a_SOURCES = \
-       lib/gtk-contrib/gtkextra-sheet.h \
-       lib/gtk-contrib/psppire-sheet.c \
-       lib/gtk-contrib/psppire-sheet.h \
+lib_gtk_contrib_libxpaned_a_SOURCES = \
        lib/gtk-contrib/gtkxpaned.c \
        lib/gtk-contrib/gtkxpaned.h
 
 EXTRA_DIST += lib/gtk-contrib/OChangeLog \
-       lib/gtk-contrib/README \
-       lib/gtk-contrib/gtk-builder-convert
+       lib/gtk-contrib/README