X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=a426cefdd3677b670c387a2e4c4684a5d5f09d30;hb=9c3c856e0512309c9c301ee41c2d465dbbe9b8c6;hp=7f56a84bfc9d8c15587d51bf2e73c3b16bb06730;hpb=24ce3b8ab286d1460b4cfd65ba1e82c23ff40f2c;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 7f56a84bfc..a426cefdd3 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -3,21 +3,25 @@
 include $(top_srcdir)/src/ui/gui/sheet/automake.mk
 
 UI_FILES = \
+	src/ui/gui/aggregate.ui \
 	src/ui/gui/binomial.ui \
 	src/ui/gui/compute.ui \
 	src/ui/gui/correlation.ui \
 	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 \
 	src/ui/gui/find.ui \
 	src/ui/gui/frequencies.ui \
+	src/ui/gui/k-related.ui \
 	src/ui/gui/oneway.ui \
 	src/ui/gui/psppire.ui \
 	src/ui/gui/rank.ui \
 	src/ui/gui/sort.ui \
+	src/ui/gui/split-file.ui \
 	src/ui/gui/recode.ui \
 	src/ui/gui/regression.ui \
 	src/ui/gui/reliability.ui \
@@ -63,6 +67,7 @@ src_ui_gui_psppire_LDADD = \
 	src/libpspp-core.la \
 	$(GTK_LIBS) \
 	$(CAIRO_LIBS) \
+	$(LIBICONV) \
 	$(LIBINTL)
 
 src_ui_gui_psppiredir = $(pkgdatadir)
@@ -116,6 +121,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/psppire-hbuttonbox.c \
 	src/ui/gui/psppire-vbuttonbox.c \
 	src/ui/gui/psppire-acr.c \
+	src/ui/gui/aggregate-dialog.c \
+	src/ui/gui/aggregate-dialog.h \
 	src/ui/gui/binomial-dialog.c \
 	src/ui/gui/binomial-dialog.h \
 	src/ui/gui/checkbox-treeview.c \
@@ -138,6 +145,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 \
@@ -154,6 +163,8 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/help-menu.c \
 	src/ui/gui/help-menu.h \
 	src/ui/gui/helper.h \
+	src/ui/gui/k-related-dialog.c \
+	src/ui/gui/k-related-dialog.h \
 	src/ui/gui/main.c \
 	src/ui/gui/missing-val-dialog.c \
 	src/ui/gui/missing-val-dialog.h \
@@ -214,8 +225,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 \
@@ -247,7 +256,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    ; \
@@ -280,3 +288,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