Add header wrapper for glib to supply g_memdup2() for glib before 2.68.

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

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index f169878887f624cb61e7400861c7875cfa1600c4..04da062f21e2c189568982f186e1b2f8ba83c975 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -72,10 +72,9 @@ UI_FILES = \
 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=
 
@@ -99,6 +98,8 @@ src_ui_gui_psppire_LDFLAGS = \
        $(PG_LDFLAGS)
 
 
+
+
 if RELOCATABLE_VIA_LD
 src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 else
@@ -118,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
@@ -215,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 = \
@@ -334,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 \
@@ -372,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
@@ -396,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 \
@@ -434,8 +428,29 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
 CLEANFILES += src/ui/gui/include/gtk/gtk.h
 EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h src/ui/gui/resources.xml
 
+# <gtk/gtk.h> wrapper
+BUILT_SOURCES += src/ui/gui/include/glib.h
+src/ui/gui/include/glib.h: src/ui/gui/include/glib.in.h
+       @$(MKDIR_P) src/ui/gui/include
+       $(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_GLIB_H''%|$(NEXT_GLIB_H)|g' \
+             < $(srcdir)/src/ui/gui/include/glib.in.h; \
+       } > $@-t && \
+       mv $@-t $@
+CLEANFILES += src/ui/gui/include/glib.h
+EXTRA_DIST += src/ui/gui/include/glib.in.h
+
 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