projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use @VARIABLE@ instead of $(VARIABLE) consistently in Makefiles.
[pspp-builds.git]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index bf168f997f6e2eb5ed99e8daf55f2fe966b48806..a52f28028bf19056e1ee6df55b1447cffb641103 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-26,7
+26,7
@@
src_ui_gui_psppire_LDADD = \
src/libpspp.la \
src/libpspp-core.la \
$(GTK_LIBS) \
src/libpspp.la \
src/libpspp-core.la \
$(GTK_LIBS) \
- @LIBINTL@
+ $(LIBINTL)
src_ui_gui_psppiredir = $(pkgdatadir)
src_ui_gui_psppiredir = $(pkgdatadir)
@@
-46,7
+46,7
@@
INSTALL_DATA_HOOKS += install-icons
uninstall-icons:
for size in 16x16 ; do \
uninstall-icons:
for size in 16x16 ; do \
-
$(RM)
$(themedir)/$$size/$(context)/psppicon.png ; \
+
rm -f
$(themedir)/$$size/$(context)/psppicon.png ; \
done
gtk-update-icon-cache --ignore-theme-index $(themedir)
done
gtk-update-icon-cache --ignore-theme-index $(themedir)
@@
-61,6
+61,7
@@
UI_FILES = \
src/ui/gui/frequencies.ui \
src/ui/gui/message-dialog.ui \
src/ui/gui/oneway.ui \
src/ui/gui/frequencies.ui \
src/ui/gui/message-dialog.ui \
src/ui/gui/oneway.ui \
+ src/ui/gui/psppire.ui \
src/ui/gui/rank.ui \
src/ui/gui/recode.ui \
src/ui/gui/regression.ui \
src/ui/gui/rank.ui \
src/ui/gui/recode.ui \
src/ui/gui/regression.ui \
@@
-72,7
+73,6
@@
UI_FILES = \
nodist_src_ui_gui_psppire_DATA = \
$(top_builddir)/src/ui/gui/data-editor.ui \
nodist_src_ui_gui_psppire_DATA = \
$(top_builddir)/src/ui/gui/data-editor.ui \
- $(top_builddir)/src/ui/gui/psppire.ui \
$(top_builddir)/src/ui/gui/output-viewer.ui \
$(top_builddir)/src/ui/gui/syntax-editor.ui
$(top_builddir)/src/ui/gui/output-viewer.ui \
$(top_builddir)/src/ui/gui/syntax-editor.ui
@@
-219,7
+219,6
@@
src_ui_gui_psppire_SOURCES = \
src/ui/gui/widgets.c \
src/ui/gui/widgets.h \
src/ui/gui/data-editor.glade \
src/ui/gui/widgets.c \
src/ui/gui/widgets.h \
src/ui/gui/data-editor.glade \
- src/ui/gui/psppire.glade \
src/ui/gui/output-viewer.glade \
src/ui/gui/syntax-editor.glade
src/ui/gui/output-viewer.glade \
src/ui/gui/syntax-editor.glade
@@
-250,6
+249,7
@@
src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
glib-genmarshal --header --prefix=psppire_marshal $< > $@
src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
glib-genmarshal --header --prefix=psppire_marshal $< > $@
+SUFFIXES += .glade .ui
.glade.ui:
$(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@
.glade.ui:
$(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@