repair glade; switched to gladeui-2.0; removed the internal-child in psppire-dialog.

[pspp] / glade / automake.mk

diff --git a/glade/automake.mk b/glade/automake.mk
index d1077817d5dad2bb62f92b4bb91dffcf604b5427..4bb87f1ab69f024d38af9daf92906f8baf0cb8d3 100644 (file)
--- a/glade/automake.mk
+++ b/glade/automake.mk
@@ -2,21 +2,22 @@
 
 module_LTLIBRARIES = libglade-psppire.la
 
-moduledir = `pkg-config --variable=moduledir gladeui-1.0`
-catalogdir = `pkg-config --variable=catalogdir gladeui-1.0`
-pixmapdir = `pkg-config --variable=pixmapdir gladeui-1.0`
+moduledir = `pkg-config --variable=moduledir gladeui-2.0`
+catalogdir = `pkg-config --variable=catalogdir gladeui-2.0`
+pixmapdir = `pkg-config --variable=pixmapdir gladeui-2.0`
 
-small_pixmapdir = $(pixmapdir)/16x16
-large_pixmapdir = $(pixmapdir)/22x22
+small_pixmapdir = $(pixmapdir)/hicolor/16x16/actions
+large_pixmapdir = $(pixmapdir)/hicolor/22x22/actions
+
+# format.c for psppire-value-entry.c
 
 libglade_psppire_la_SOURCES = \
-       glade/dialog.c \
-       glade/bbox.c \
-       glade/selector.c \
-       glade/acr.c \
-       glade/dictview.c \
-       glade/var-view.c \
        src/ui/gui/helper.c \
+       src/ui/gui/dialog-common.c \
+       src/ui/gui/psppire-var-ptr.c \
+       src/data/format.c \
+       src/ui/gui/psppire-format.c \
+       src/data/value-labels.c \
        src/ui/gui/psppire-conf.c \
        src/ui/gui/psppire-acr.c \
        src/ui/gui/psppire-buttonbox.c \
@@ -28,26 +29,29 @@ libglade_psppire_la_SOURCES = \
        src/ui/gui/psppire-selector.c \
        src/ui/gui/psppire-select-dest.c \
        src/ui/gui/psppire-var-view.c \
+       src/ui/gui/psppire-checkbox-treeview.c \
+       src/ui/gui/psppire-val-chooser.c \
+       src/ui/gui/psppire-value-entry.c \
        src/ui/gui/psppire-window-base.c
 
 dist_catalog_DATA = \
        glade/psppire.xml
 
 dist_small_pixmap_DATA = \
-       glade/icons/16x16/psppire-acr.png \
-       glade/icons/16x16/psppire-hbuttonbox.png \
-       glade/icons/16x16/psppire-vbuttonbox.png \
-       glade/icons/16x16/psppire-dialog.png \
-       glade/icons/16x16/psppire-keypad.png \
-       glade/icons/16x16/psppire-selector.png 
+       glade/icons/16x16/widget-psppire-psppire-acr.png \
+       glade/icons/16x16/widget-psppire-psppire-hbuttonbox.png \
+       glade/icons/16x16/widget-psppire-psppire-vbuttonbox.png \
+       glade/icons/16x16/widget-psppire-psppire-dialog.png \
+       glade/icons/16x16/widget-psppire-psppire-keypad.png \
+       glade/icons/16x16/widget-psppire-psppire-selector.png
 
 dist_large_pixmap_DATA = \
-       glade/icons/22x22/psppire-acr.png \
-       glade/icons/22x22/psppire-hbuttonbox.png \
-       glade/icons/22x22/psppire-vbuttonbox.png \
-       glade/icons/22x22/psppire-dialog.png \
-       glade/icons/22x22/psppire-keypad.png \
-       glade/icons/22x22/psppire-selector.png 
+       glade/icons/22x22/widget-psppire-psppire-acr.png \
+       glade/icons/22x22/widget-psppire-psppire-hbuttonbox.png \
+       glade/icons/22x22/widget-psppire-psppire-vbuttonbox.png \
+       glade/icons/22x22/widget-psppire-psppire-dialog.png \
+       glade/icons/22x22/widget-psppire-psppire-keypad.png \
+       glade/icons/22x22/widget-psppire-psppire-selector.png
 
 
 libglade_psppire_la_CFLAGS = $(GLADE_UI_CFLAGS) $(GLADE_CFLAGS) \