X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fautomake.mk;h=e0e9cab0c796da219a5d515ee7d627f893d2ac37;hb=faa4f310af58bc1dfd56be0575745c91a59d88b3;hp=54e8da0c610af7e409d7bd3e8d58e6de9025bde7;hpb=33cdbdf7e095370cf04240eed21344205a487191;p=pspp

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 54e8da0c61..e0e9cab0c7 100644
--- 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,29 +69,22 @@ 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=
 
 bin_PROGRAMS += src/ui/gui/psppire
 noinst_PROGRAMS += src/ui/gui/spreadsheet-test
 
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) $(SPREAD_SHEET_WIDGET_CFLAGS) $(AM_CFLAGS) -DGDK_MULTIHEAD_SAFE=1
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) \
+        $(SPREAD_SHEET_WIDGET_CFLAGS) \
+        $(LIBRSVG_CFLAGS) \
+        $(AM_CFLAGS) -DGDK_MULTIHEAD_SAFE=1
 src_ui_gui_spreadsheet_test_CFLAGS = $(GTK_CFLAGS) $(AM_CFLAGS) -DGDK_MULTIHEAD_SAFE=1
 
 if cc_is_gcc
@@ -104,6 +98,8 @@ src_ui_gui_psppire_LDFLAGS = \
 	$(PG_LDFLAGS)
 
 
+
+
 if RELOCATABLE_VIA_LD
 src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 else
@@ -120,10 +116,16 @@ src_ui_gui_psppire_LDADD = \
 	$(GTHREAD_LIBS) \
 	$(GTKSOURCEVIEW_LIBS) \
 	$(SPREAD_SHEET_WIDGET_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(CAIRO_LIBS) \
 	$(LIBINTL) \
 	$(GSL_LIBS)
 
+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 \
@@ -165,11 +167,10 @@ src_ui_gui_psppire_SOURCES = \
 	src/ui/gui/missing-val-dialog.h \
 	src/ui/gui/options-dialog.c \
 	src/ui/gui/options-dialog.h \
+	src/ui/gui/pre-initialisation.h \
 	src/ui/gui/psppire.c \
 	src/ui/gui/psppire-data-editor.c \
 	src/ui/gui/psppire-data-editor.h \
-	src/ui/gui/psppire-data-sheet.c \
-	src/ui/gui/psppire-data-sheet.h \
 	src/ui/gui/psppire-data-store.c \
 	src/ui/gui/psppire-data-store.h \
 	src/ui/gui/psppire-data-window.c \
@@ -181,6 +182,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 \
@@ -189,16 +194,14 @@ 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 \
 	src/ui/gui/psppire-syntax-window.h \
 	src/ui/gui/psppire-value-entry.c \
 	src/ui/gui/psppire-value-entry.h \
-	src/ui/gui/psppire-variable-sheet.c \
-	src/ui/gui/psppire-variable-sheet.h \
-	src/ui/gui/psppire-var-sheet-header.c \
-	src/ui/gui/psppire-var-sheet-header.h \
 	src/ui/gui/psppire-window.c \
 	src/ui/gui/psppire-window.h \
 	src/ui/gui/psppire-window-register.c \
@@ -218,6 +221,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 = \
@@ -229,6 +236,8 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
 	src/ui/gui/psppire-checkbox-treeview.h \
 	src/ui/gui/psppire-conf.c \
 	src/ui/gui/psppire-conf.h \
+	src/ui/gui/psppire-data-sheet.c \
+	src/ui/gui/psppire-data-sheet.h \
 	src/ui/gui/psppire-dialog-action-1sks.c \
 	src/ui/gui/psppire-dialog-action-1sks.h \
 	src/ui/gui/psppire-dialog-action-aggregate.c \
@@ -335,10 +344,16 @@ 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 \
 	src/ui/gui/psppire-var-view.h \
+	src/ui/gui/psppire-var-sheet-header.c \
+	src/ui/gui/psppire-var-sheet-header.h \
+	src/ui/gui/psppire-variable-sheet.c \
+	src/ui/gui/psppire-variable-sheet.h \
 	src/ui/gui/psppire-window-base.c \
 	src/ui/gui/psppire-window-base.h \
 	src/ui/gui/dialog-common.c \
@@ -351,6 +366,7 @@ src_ui_gui_libwidgets_essential_la_SOURCES = \
 src_ui_gui_libwidgets_essential_la_CFLAGS = \
 	$(GTK_CFLAGS) \
 	$(GTKSOURCEVIEW_CFLAGS) \
+        $(SPREAD_SHEET_WIDGET_CFLAGS) \
 	$(AM_CFLAGS)
 
 # The unused-parameter warning is not by default disabled
@@ -368,16 +384,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
@@ -392,16 +398,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 \
@@ -432,6 +428,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
 
@@ -452,7 +453,7 @@ src_ui_gui_libpsppire_glade_la_CFLAGS = $(GTK_CFLAGS) $(AM_CFLAGS)
 if cc_is_gcc
 src_ui_gui_libpsppire_glade_la_CFLAGS += -Wno-unused-parameter
 endif
-src_ui_gui_libpsppire_glade_la_LDFLAGS = -release $(VERSION)
+src_ui_gui_libpsppire_glade_la_LDFLAGS = -release $(VERSION)  $(SPREAD_SHEET_WIDGET_LIBS)
 
 EXTRA_DIST += src/ui/gui/psppire.xml src/ui/gui/glade-wrapper.in
 
@@ -467,3 +468,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