gui: Move null_if_empty_param() from psppire-window to helper.

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 1595fdd00e356bca8d6504e271087c9fe3ad559c..f004fa6021e04a64fa71ae6a009956c76aed202e 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -10,6 +10,7 @@ UI_FILES = \
        src/ui/gui/crosstabs.ui \
        src/ui/gui/chi-square.ui \
        src/ui/gui/descriptives.ui \
+       src/ui/gui/entry-dialog.ui \
        src/ui/gui/examine.ui \
        src/ui/gui/goto-case.ui \
        src/ui/gui/factor.ui \
@@ -65,8 +66,7 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
-       $(CAIRO_LIBS) \
-       $(LIBINTL)
+       $(CAIRO_LIBS)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
 
@@ -143,6 +143,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/dialog-common.h \
        src/ui/gui/dict-display.h \
        src/ui/gui/dict-display.c \
+       src/ui/gui/entry-dialog.c \
+       src/ui/gui/entry-dialog.h \
        src/ui/gui/examine-dialog.c \
        src/ui/gui/examine-dialog.h \
        src/ui/gui/executor.c \
@@ -221,8 +223,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/sort-cases-dialog.h \
        src/ui/gui/split-file-dialog.c \
        src/ui/gui/split-file-dialog.h \
-       src/ui/gui/syntax-editor-source.c \
-       src/ui/gui/syntax-editor-source.h \
        src/ui/gui/text-data-import-dialog.c \
        src/ui/gui/text-data-import-dialog.h \
        src/ui/gui/transpose-dialog.c \
@@ -254,7 +254,6 @@ nodist_src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-marshal.c \
        src/ui/gui/psppire-marshal.h
 
-
 yelp-check:
        @if ! yelp --version > /dev/null 2>&1 ; then \
                echo    ; \
@@ -287,3 +286,19 @@ endif HAVE_GUI
 #ensure the installcheck passes even if there is no X server available
 installcheck-local:
        DISPLAY=/invalid/port $(MAKE) $(AM_MAKEFLAGS) installcheck-binPROGRAMS
+
+# <gtk/gtk.h> wrapper
+src_ui_gui_psppire_CPPFLAGS = $(AM_CPPFLAGS) -Isrc/ui/gui/include
+BUILT_SOURCES += src/ui/gui/include/gtk/gtk.h
+src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
+       @$(MKDIR_P) src/ui/gui/include/gtk
+       $(AM_V_GEN)rm -f $@-t $@ && \
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+             -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+             -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+             -e 's|@''NEXT_GTK_GTK_H''@|$(NEXT_GTK_GTK_H)|g' \
+             < $(srcdir)/src/ui/gui/include/gtk/gtk.in.h; \
+       } > $@-t && \
+       mv $@-t $@
+EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h