Made libglade_psppire.so link against gl/libgl.a

[pspp-builds.git] / glade / automake.mk

diff --git a/glade/automake.mk b/glade/automake.mk
index 5d5a65839b9c5397136cc8cd320aa8ad96631a46..a24e88fb9486255ca4d620e08be3849912a6a794 100644 (file)
--- a/glade/automake.mk
+++ b/glade/automake.mk
@@ -2,20 +2,47 @@
 
 module_LTLIBRARIES = libglade-psppire.la
 
-moduledir = `pkg-config --variable=moduledir libgladeui-1.0`
-catalogdir = `pkg-config --variable=catalogdir libgladeui-1.0`
+moduledir = `pkg-config --variable=moduledir gladeui-1.0`
+catalogdir = `pkg-config --variable=catalogdir gladeui-1.0`
+pixmapdir = `pkg-config --variable=pixmapdir gladeui-1.0`
+
+small_pixmapdir = $(pixmapdir)/16x16
+large_pixmapdir = $(pixmapdir)/22x22
 
 libglade_psppire_la_SOURCES = \
        glade/dialog.c \
        glade/bbox.c \
        glade/selector.c \
-       src/ui/gui/psppire-dialog.c \
+       glade/acr.c \
+       src/ui/gui/psppire-acr.c \
        src/ui/gui/psppire-buttonbox.c \
+       src/ui/gui/psppire-hbuttonbox.c \
+       src/ui/gui/psppire-vbuttonbox.c \
+       src/ui/gui/psppire-dialog.c \
+       src/ui/gui/psppire-keypad.c \
        src/ui/gui/psppire-selector.c
 
 nodist_catalog_DATA = \
        glade/psppire.xml
 
+nodist_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 
+
+nodist_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 
+
 
 libglade_psppire_la_CFLAGS = $(GLADE_UI_CFLAGS) $(GLADE_CFLAGS) \
-       -I src/ui/gui
+       -I $(top_srcdir)/src/ui/gui -DDEBUGGING
+
+libglade_psppire_la_LIBADD = gl/libgl.la