X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=glade%2Fautomake.mk;h=5ad3c2ce98baa7e4877dfab25ab934d447b29e4c;hb=7751519f5ca0b6106fe3d611010a70804677ab86;hp=e9af9aeb49e290ac627f78ea17de1808441c6d24;hpb=5d5b324c12dc799e6e4dc3230e93edaa7d0a0272;p=pspp-builds.git diff --git a/glade/automake.mk b/glade/automake.mk index e9af9aeb..5ad3c2ce 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,7 +13,11 @@ 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 \ src/ui/gui/psppire-dialog.c \ src/ui/gui/psppire-keypad.c \ src/ui/gui/psppire-selector.c @@ -22,17 +26,19 @@ nodist_catalog_DATA = \ glade/psppire.xml nodist_small_pixmap_DATA = \ - glade/icons/16x16/psppire-buttonbox.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-buttonbox.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/16x16/psppire-selector.png + glade/icons/22x22/psppire-selector.png libglade_psppire_la_CFLAGS = $(GLADE_UI_CFLAGS) $(GLADE_CFLAGS) \ - -I src/ui/gui -DDEBUGGING + -I $(top_srcdir)/src/ui/gui -DDEBUGGING