Mercurial > octave
view libgui/module.mk @ 23427:48fd5980e29a
Refactor and normalize generated build info source files
* Makefile.am (build-info-commands): New macro to generate build info source
files containing hg revision.
* libgui/module.mk (EXTRA_libgui_liboctgui_la_SOURCES): Delete variable
referencing unnecessary dummy source file.
(libgui_liboctgui_la_CPPFLAGS, libgui_liboctgui_la_CFLAGS,
libgui_liboctgui_la_CXXFLAGS): New compilation variables.
(libgui_CLEANFILES, libgui_EXTRA_DIST, nodist_libgui_liboctgui_la_SOURCES,
noinst_HEADERS): Include libgui/liboctgui-build-info.* files moved from
libgui/src.
(libgui/liboctgui-build-info.cc): Redefine rule moved from libgui/src/module.mk
using $(build-info-commands).
* libgui/src/module.mk (libgui_CLEANFILES, libgui_EXTRA_DIST,
nodist_libgui_src_libgui_src_la_SOURCES, noinst_HEADERS): Remove
libgui/src/liboctgui-build-info.* files moved to libgui.
(libgui/src/liboctgui-build-info.cc): Delete rule.
* libinterp/module.mk (libinterp/liboctinterp-build-info.cc): Redefine using
$(build-info-commands).
* liboctave/module.mk (EXTRA_liboctave_liboctave_la_SOURCES): Delete variable
referencing unnecessary dummy source file.
(liboctave/liboctave-build-info.cc): Redefine using $(build-info-commands).
* src/module.mk (OCTAVE_GUI_CPPFLAGS): Include -I$(srcdir)/libgui in the list.
(src/octave-build-info.cc): Redefine using $(build-info-commands).
* libgui/liboctgui-build-info.h, libgui/liboctgui-build-info.in.cc: Move from
libgui/src.
* libgui/.dummy_force_cxx_link.cc, liboctave/.dummy_force_cxx_link.cc: Delete.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Sat, 22 Apr 2017 14:11:40 -0700 |
parents | 0bfdfd5870d7 |
children | 8308417aff1c |
line wrap: on
line source
if AMCOND_BUILD_QT_GUI libgui_EXTRA_DIST = libgui_CLEANFILES = libgui_DISTCLEANFILES = libgui_MAINTAINERCLEANFILES = MOC_CPPFLAGS = ## Fix for bug #42839 where -mieee CFLAG option is added to CPPFLAGS by gnulib. ## Users may also pass other options in CPPFLAGS that moc does not understand. ## Only keep moc-compatible options -Idir, -Dmacro, and -Umacro. MOC_OCTAVE_CPPFLAGS = $(filter -I% -D% -U%, $(AM_CPPFLAGS) $(CPPFLAGS)) octlib_LTLIBRARIES += libgui/liboctgui.la TRANSLATIONS = \ libgui/languages/be_BY.ts \ libgui/languages/de_DE.ts \ libgui/languages/en_US.ts \ libgui/languages/es_ES.ts \ libgui/languages/eu_ES.ts \ libgui/languages/fr_FR.ts \ libgui/languages/it_IT.ts \ libgui/languages/ja_JP.ts \ libgui/languages/nl_NL.ts \ libgui/languages/pt_BR.ts \ libgui/languages/pt_PT.ts \ libgui/languages/ru_RU.ts \ libgui/languages/uk_UA.ts \ libgui/languages/zh_CN.ts LOCALES = $(patsubst libgui/languages/%.ts, libgui/languages/%.qm, $(TRANSLATIONS)) noinst_HEADERS += \ libgui/liboctgui-build-info.h include libgui/src/module.mk include libgui/graphics/module.mk include libgui/qterminal-module.mk nodist_libgui_liboctgui_la_SOURCES = \ libgui/liboctgui-build-info.cc libgui_liboctgui_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ @OCTGUI_DLL_DEFS@ \ -Ilibgui \ -I$(srcdir)/libgui libgui_liboctgui_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) libgui_liboctgui_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) libgui_liboctgui_la_LIBADD = \ libgui/qterminal/libqterminal.la \ libgui/src/libgui-src.la \ libgui/graphics/libgui-graphics.la \ libinterp/liboctinterp.la \ liboctave/liboctave.la \ $(LIBOCTGUI_LINK_DEPS) # Increment these as needed and according to the rules in the libtool manual: libgui_liboctgui_current = 2 libgui_liboctgui_revision = 0 libgui_liboctgui_age = 0 libgui_liboctgui_version_info = $(libgui_liboctgui_current):$(libgui_liboctgui_revision):$(libgui_liboctgui_age) libgui_liboctgui_la_LDFLAGS = \ -version-info $(libgui_liboctgui_version_info) \ $(NO_UNDEFINED_LDFLAG) \ -bindir $(bindir) \ $(LIBOCTGUI_LINK_OPTS) \ $(WARN_LDFLAGS) octetc_DATA += libgui/default-qt-settings octlocale_DATA += $(LOCALES) libgui/default-qt-settings: libgui/default-qt-settings.in build-aux/mk-default-qt-settings.sh | libgui/$(octave_dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/mk-default-qt-settings.sh) DIRSTAMP_FILES += \ libgui/$(octave_dirstamp) define moc-command rm -f $@-t $@ && \ ( echo "#if defined (HAVE_CONFIG_H)"; \ echo '# include "config.h"'; \ echo "#endif"; \ $(MOC) $(MOCFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MOC_OCTAVE_CPPFLAGS) $(MOC_CPPFLAGS) $(libgui_liboctgui_la_CPPFLAGS) $< ) > $@-t && \ mv $@-t $@ endef define rcc-command rm -f $@-t $@ && \ ( echo "#if defined (HAVE_CONFIG_H)"; \ echo '# include "config.h"'; \ echo "#endif"; \ echo "// Ignore unused variable warnings in generated code."; \ echo "#if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)"; \ echo "#pragma GCC diagnostic ignored \"-Wunused-variable\""; \ echo "#endif"; \ QT_HASH_SEED=0 $(RCC) $(RCCFLAGS) -name $(@D) $< ) > $@-t && \ mv $@-t $@ endef moc-%.cc: %.h $(AM_V_GEN)$(moc-command) ui-%.h: %.ui $(AM_V_GEN)$(UIC) $(UICFLAGS) -o $@ $< qrc-%.cc: %.qrc $(AM_V_GEN)$(rcc-command) AM_V_lrelease = $(am__v_lrelease_$(V)) am__v_lrelease_ = $(am__v_lrelease_$(AM_DEFAULT_VERBOSITY)) am__v_lrelease_0 = -silent am__v_lrelease_1 = %.qm: %.ts | libgui/languages/$(octave_dirstamp) $(AM_V_GEN)$(LRELEASE) $(LRELEASEFLAGS) $(AM_V_lrelease) -qm $@ $< DIRSTAMP_FILES += \ libgui/languages/$(octave_dirstamp) libgui_EXTRA_DIST += \ $(TRANSLATIONS) \ libgui/default-qt-settings.in \ libgui/liboctgui-build-info.in.cc EXTRA_DIST += $(libgui_EXTRA_DIST) libgui_CLEANFILES += \ libgui/liboctgui-build-info.cc libgui_DISTCLEANFILES += \ libgui/default-qt-settings \ $(LOCALES) CLEANFILES += $(libgui_CLEANFILES) DISTCLEANFILES += $(libgui_DISTCLEANFILES) MAINTAINERCLEANFILES += $(libgui_MAINTAINERCLEANFILES) libgui-clean: rm -f $(libgui_CLEANFILES) libgui-distclean: libgui-clean rm -f $(libgui_DISTCLEANFILES) libgui-maintainer-clean: libgui-distclean rm -f $(libgui_MAINTAINERCLEANFILES) libgui/liboctgui-build-info.cc: libgui/liboctgui-build-info.in.cc HG-ID | libgui/$(octave_dirstamp) $(AM_V_GEN)$(build-info-commands) endif