Update to newest gnulib.

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 37dbdb4e82e56f56674532aa3ec488292e3caa12..42500c049fbdd10a842ecfd6eb6dcd0823ae24ff 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -56,6 +56,7 @@ UI_FILES = \
        src/ui/gui/roc.ui \
        src/ui/gui/scatterplot.ui \
        src/ui/gui/select-cases.ui \
+       src/ui/gui/spreadsheet-import.ui \
        src/ui/gui/t-test.ui \
        src/ui/gui/text-data-import.ui \
        src/ui/gui/transpose.ui \
@@ -68,22 +69,12 @@ UI_FILES = \
        src/ui/gui/var-type-dialog.ui \
        src/ui/gui/weight.ui
 
-
-$(top_srcdir)/doc/help-pages-list: $(UI_FILES)
-        $(AM_V_GEN)cat $^ | grep '"help[-_]page"' | \
-   $(SED) -e 's% *<property name="help[-_]page">\([^<]*\)</property>%//*[@id='"'"'\1'"'"']%' \
-       -e 's%#%'"'"']/*[@id='"'"'%g' > $@,tmp
-       test -s $@,tmp
-       mv $@,tmp $@
-
-EXTRA_DIST += doc/help-pages-list
-
+if building_gui
 
 EXTRA_DIST += \
-       src/ui/gui/org.fsf.pspp.metainfo.xml.in \
-       src/ui/gui/org.fsf.pspp.desktop.in \
        src/ui/gui/marshaller-list \
-       src/ui/gui/pspplogo.svg
+       src/ui/gui/pspplogo.svg \
+       src/ui/gui/pspp.rc.in
 
 src_ui_gui_psppire_CPPFLAGS=
 
@@ -107,6 +98,8 @@ src_ui_gui_psppire_LDFLAGS = \
        $(PG_LDFLAGS)
 
 
+
+
 if RELOCATABLE_VIA_LD
 src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 else
@@ -126,13 +119,20 @@ src_ui_gui_psppire_LDADD = \
        $(LIBRSVG_LIBS) \
        $(CAIRO_LIBS) \
        $(LIBINTL) \
-       $(GSL_LIBS)
+       $(GSL_LIBS) \
+       $(LIB_GETRANDOM)
+
+if host_is_w32
+src_ui_gui_psppire_LDADD += src/ui/gui/pspp.res
+src_ui_gui_psppire_CFLAGS += -mwindows -mwin32
+endif
 
 
 src_ui_gui_spreadsheet_test_LDADD = \
        src/libpspp-core.la \
        $(GTK_LIBS) \
-       $(GTHREAD_LIBS)
+       $(GTHREAD_LIBS) \
+       $(LIB_GETRANDOM)
 
 
 src_ui_gui_spreadsheet_test_SOURCES = src/ui/gui/spreadsheet-test.c src/ui/gui/psppire-spreadsheet-model.c
@@ -184,6 +184,10 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire.h \
        src/ui/gui/psppire-import-assistant.c \
        src/ui/gui/psppire-import-assistant.h \
+       src/ui/gui/psppire-import-spreadsheet.c \
+       src/ui/gui/psppire-import-spreadsheet.h \
+       src/ui/gui/psppire-import-textfile.c \
+       src/ui/gui/psppire-import-textfile.h \
        src/ui/gui/psppire-lex-reader.c \
        src/ui/gui/psppire-lex-reader.h \
        src/ui/gui/psppire-output-view.c \
@@ -192,6 +196,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-output-window.h \
        src/ui/gui/psppire-scanf.c \
        src/ui/gui/psppire-scanf.h \
+       src/ui/gui/psppire-spreadsheet-data-model.c \
+       src/ui/gui/psppire-spreadsheet-data-model.h \
        src/ui/gui/psppire-spreadsheet-model.c \
        src/ui/gui/psppire-spreadsheet-model.h \
        src/ui/gui/psppire-syntax-window.c \
@@ -217,6 +223,10 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/windows-menu.c \
        src/ui/gui/windows-menu.h
 
+src/ui/gui/pspp.rc: src/ui/gui/pspp.rc.in
+       @$(MKDIR_P) src/ui/gui
+       sed -e 's/%version%/'$(PACKAGE_VERSION)'/' $< > $@
+
 noinst_LTLIBRARIES += src/ui/gui/libwidgets-essential.la
 
 src_ui_gui_libwidgets_essential_la_SOURCES = \
@@ -336,6 +346,8 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
        src/ui/gui/psppire-text-file.h \
        src/ui/gui/psppire-val-chooser.c \
        src/ui/gui/psppire-val-chooser.h \
+       src/ui/gui/psppire-var-info.c \
+       src/ui/gui/psppire-var-info.h \
        src/ui/gui/psppire-var-ptr.c \
        src/ui/gui/psppire-var-ptr.h \
        src/ui/gui/psppire-var-view.c \
@@ -374,16 +386,6 @@ nodist_src_ui_gui_psppire_SOURCES = \
 
 AM_CPPFLAGS += -Isrc
 
-src/ui/gui/org.fsf.pspp.metainfo.xml: src/ui/gui/org.fsf.pspp.metainfo.xml.in $(POFILES)
-       $(AM_V_GEN)$(MSGFMT) --xml --template $< -o $@ -d $(top_srcdir)/po || \
-         $(MSGFMT) -L appdata --xml --template $< -o $@ -d $(top_srcdir)/po
-
-src/ui/gui/org.fsf.pspp.desktop: src/ui/gui/org.fsf.pspp.desktop.in $(POFILES)
-       $(AM_V_GEN)$(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po
-
-CLEANFILES+=src/ui/gui/org.fsf.pspp.desktop \
-            src/ui/gui/org.fsf.pspp.metainfo.xml
-
 src/ui/gui/resources.c: src/ui/gui/resources.xml
        $(AM_V_at)$(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/src/ui/gui --generate-source $< --target=$@,out
        $(AM_V_GEN)echo '#include <config.h>' > $@,tmp
@@ -398,16 +400,6 @@ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
 
-mimedir = $(datadir)/mime/packages
-mime_DATA = src/ui/gui/pspp.xml
-EXTRA_DIST += src/ui/gui/pspp.xml
-
-desktopdir = $(datadir)/applications
-desktop_DATA = src/ui/gui/org.fsf.pspp.desktop
-
-appdatadir = $(datadir)/metainfo
-dist_appdata_DATA = src/ui/gui/org.fsf.pspp.metainfo.xml
-
 BUILT_SOURCES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h src/ui/gui/resources.c
 
 CLEANFILES += src/ui/gui/psppire-marshal.c src/ui/gui/psppire-marshal.h \
@@ -438,6 +430,11 @@ EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h src/ui/gui/resources.xml
 
 include $(top_srcdir)/src/ui/gui/icons/automake.mk
 
+src/ui/gui/pspp.res: src/ui/gui/pspp.rc $(w32_icons)
+       @$(MKDIR_P) src/ui/gui
+       $(host_triplet)-windres  $< -O coff -o $@
+
+
 UNINSTALL_DATA_HOOKS += update-icon-cache
 INSTALL_DATA_HOOKS += update-icon-cache
 
@@ -473,3 +470,5 @@ glade-tools: src/ui/gui/glade-wrapper src/ui/gui/libpsppire-glade.la
 # EXTRA_pkgLTLIBRARIES if DESTDIR is set.  It should not do that.
 install-EXTRA_pkgLTLIBRARIES:
        true
+
+endif