Merge remote branch 'origin/sourceview'

[pspp] / src / ui / gui / automake.mk

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index bdb695df1a8955e37bc29572d151889e753a424d..2c8e02b6ff364be572f90929b1d45727d8431e0a 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -20,6 +20,7 @@ UI_FILES = \
        src/ui/gui/frequencies.ui \
        src/ui/gui/k-means.ui \
        src/ui/gui/k-related.ui \
+       src/ui/gui/ks-one-sample.ui \
        src/ui/gui/oneway.ui \
        src/ui/gui/paired-samples.ui \
        src/ui/gui/psppire.ui \
@@ -49,7 +50,7 @@ EXTRA_DIST += \
 if HAVE_GUI
 bin_PROGRAMS += src/ui/gui/psppire 
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 
 
 src_ui_gui_psppire_LDFLAGS = \
@@ -71,7 +72,9 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
-       $(CAIRO_LIBS)
+       $(GTKSOURCEVIEW_LIBS) \
+       $(CAIRO_LIBS) \
+       $(LIBINTL)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -80,14 +83,17 @@ themedir = $(DESTDIR)$(datadir)/icons/hicolor
 context = apps
 
 
+install-lang:
+       $(INSTALL) $(top_srcdir)/src/ui/gui/pspp.lang $(pkgdatadir)
+       
 install-icons:
        for size in 16x16 ; do \
          $(MKDIR_P) $(themedir)/$$size/$(context) ; \
-          $(INSTALL) $(top_srcdir)/src/ui/gui/psppicon.png $(themedir)/$$size/$(context) ; \
+          $(INSTALL) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
        done 
        gtk-update-icon-cache --ignore-theme-index $(themedir)
 
-INSTALL_DATA_HOOKS += install-icons
+INSTALL_DATA_HOOKS += install-icons install-lang
 
 uninstall-icons:
        for size in 16x16 ; do \
@@ -99,6 +105,7 @@ UNINSTALL_DATA_HOOKS += uninstall-icons
 
 dist_src_ui_gui_psppire_DATA = \
        $(UI_FILES) \
+       $(top_srcdir)/src/ui/gui/pspp.lang \
        $(top_srcdir)/src/ui/gui/pspplogo.png \
        $(top_srcdir)/src/ui/gui/icons/value-labels.png \
        $(top_srcdir)/src/ui/gui/icons/goto-variable.png\
@@ -123,6 +130,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-buttonbox.c \
        src/ui/gui/psppire-hbuttonbox.c \
        src/ui/gui/psppire-vbuttonbox.c \
+       src/ui/gui/psppire-scanf.c \
+       src/ui/gui/psppire-scanf.h \
        src/ui/gui/psppire-acr.c \
        src/ui/gui/autorecode-dialog.c \
        src/ui/gui/autorecode-dialog.h \
@@ -174,6 +183,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/k-related-dialog.h \
        src/ui/gui/k-means-dialog.c \
        src/ui/gui/k-means-dialog.h \
+       src/ui/gui/ks-one-sample-dialog.c \
+       src/ui/gui/ks-one-sample-dialog.h \
        src/ui/gui/main.c \
        src/ui/gui/missing-val-dialog.c \
        src/ui/gui/missing-val-dialog.h \