projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Converted output-viewer from .glade to .ui
[pspp-builds.git]
/
src
/
ui
/
gui
/
automake.mk
diff --git
a/src/ui/gui/automake.mk
b/src/ui/gui/automake.mk
index 11bf9bc723e4693449827db2989016b9d79f7606..263e621b77b06f0cb23fde2c42f2ae3444154d6e 100644
(file)
--- a/
src/ui/gui/automake.mk
+++ b/
src/ui/gui/automake.mk
@@
-23,7
+23,7
@@
UI_FILES = \
src/ui/gui/var-sheet-dialogs.ui \
src/ui/gui/variable-info.ui \
src/ui/gui/data-editor.ui \
src/ui/gui/var-sheet-dialogs.ui \
src/ui/gui/variable-info.ui \
src/ui/gui/data-editor.ui \
- src/ui/gui/output-viewer.
glade
\
+ src/ui/gui/output-viewer.
ui
\
src/ui/gui/syntax-editor.ui
EXTRA_DIST += \
src/ui/gui/syntax-editor.ui
EXTRA_DIST += \
@@
-84,9
+84,6
@@
uninstall-icons:
UNINSTALL_DATA_HOOKS += uninstall-icons
UNINSTALL_DATA_HOOKS += uninstall-icons
-nodist_src_ui_gui_psppire_DATA = \
- $(top_builddir)/src/ui/gui/output-viewer.ui
-
dist_src_ui_gui_psppire_DATA = \
$(UI_FILES) \
$(top_srcdir)/src/ui/gui/pspplogo.png \
dist_src_ui_gui_psppire_DATA = \
$(UI_FILES) \
$(top_srcdir)/src/ui/gui/pspplogo.png \
@@
-263,10
+260,6
@@
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 $< $@
-
desktopdir = $(datadir)/applications
desktop_DATA = src/ui/gui/pspp.desktop
desktopdir = $(datadir)/applications
desktop_DATA = src/ui/gui/pspp.desktop