X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=glade%2Fautomake.mk;h=6021eecd2acc0419649d11703c419db3082d196c;hb=58c99fe1ff02707d4b6aa4101470f4a3a38b7e33;hp=20d15d64ed7e3ddb1d3f939ddb99b061ccc8a527;hpb=146997e1690f055481e2003529eaa4f8848ca4a8;p=pspp-builds.git

diff --git a/glade/automake.mk b/glade/automake.mk
index 20d15d64..6021eecd 100644
--- a/glade/automake.mk
+++ b/glade/automake.mk
@@ -2,9 +2,9 @@
 
 module_LTLIBRARIES = libglade-psppire.la
 
-moduledir = `pkg-config --variable=moduledir libgladeui-1.0`
-catalogdir = `pkg-config --variable=catalogdir libgladeui-1.0`
-pixmapdir = `pkg-config --variable=pixmapdir 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
@@ -13,6 +13,8 @@ libglade_psppire_la_SOURCES = \
 	glade/dialog.c \
 	glade/bbox.c \
 	glade/selector.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 \
@@ -20,17 +22,19 @@ libglade_psppire_la_SOURCES = \
 	src/ui/gui/psppire-keypad.c \
 	src/ui/gui/psppire-selector.c
 
-nodist_catalog_DATA = \
+dist_catalog_DATA = \
 	glade/psppire.xml
 
-nodist_small_pixmap_DATA = \
+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 
 
-nodist_large_pixmap_DATA = \
+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 \
@@ -39,4 +43,6 @@ nodist_large_pixmap_DATA = \
 
 
 libglade_psppire_la_CFLAGS = $(GLADE_UI_CFLAGS) $(GLADE_CFLAGS) \
-	-I src/ui/gui -DDEBUGGING
+	-I $(top_srcdir)/src/ui/gui -DDEBUGGING
+
+libglade_psppire_la_LIBADD = gl/libgl.la