projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output-item: Fix memory leak in output_item_dump().
[pspp]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index ad44170170f7546b271ab3279bfd16065523b6a6..e0e9cab0c796da219a5d515ee7d627f893d2ac37 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-73,7
+73,8
@@
if building_gui
EXTRA_DIST += \
src/ui/gui/marshaller-list \
EXTRA_DIST += \
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=
src_ui_gui_psppire_CPPFLAGS=
@@
-97,6
+98,8
@@
src_ui_gui_psppire_LDFLAGS = \
$(PG_LDFLAGS)
$(PG_LDFLAGS)
+
+
if RELOCATABLE_VIA_LD
src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
else
if RELOCATABLE_VIA_LD
src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
else
@@
-118,6
+121,11
@@
src_ui_gui_psppire_LDADD = \
$(LIBINTL) \
$(GSL_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 \
src_ui_gui_spreadsheet_test_LDADD = \
src/libpspp-core.la \
@@
-213,6
+221,10
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/windows-menu.c \
src/ui/gui/windows-menu.h
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 = \
noinst_LTLIBRARIES += src/ui/gui/libwidgets-essential.la
src_ui_gui_libwidgets_essential_la_SOURCES = \
@@
-332,6
+344,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-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-ptr.c \
src/ui/gui/psppire-var-ptr.h \
src/ui/gui/psppire-var-view.c \
@@
-414,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
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
UNINSTALL_DATA_HOOKS += update-icon-cache
INSTALL_DATA_HOOKS += update-icon-cache