From d1ac1c9912d0d25e5747c6351287121a300123b7 Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Tue, 27 May 2014 13:03:20 +0300 Subject: [PATCH] build-sys: get rid of the unused generate-linker-script targets. --- Makefile.am | 4 ---- src/Makefile.am | 43 ------------------------------------------- src/murphy-db/Makefile.am | 5 ----- src/murphy-db/mdb/Makefile.am | 2 -- src/murphy-db/mqi/Makefile.am | 2 -- src/murphy-db/mql/Makefile.am | 2 -- 6 files changed, 58 deletions(-) diff --git a/Makefile.am b/Makefile.am index 29d89ee..b3937c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,10 +42,6 @@ check-git-hooks: done \ fi -# linker script generation -generate-linker-scripts: - $(MAKE) -C src $@ - # cleanup clean-local: rm -f *~ diff --git a/src/Makefile.am b/src/Makefile.am index 13d37f0..e7e18ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -139,8 +139,6 @@ linker-script.common: $(libmurphy_common_la_HEADERS) clean-linker-script:: -rm -f linker-script.common -generate-linker-scripts: linker-script.common - # debug file:line-function mapping generation common-func-info.c: $(libmurphy_common_la_REGULAR_SOURCES) $(QUIET_GEN)$(top_builddir)/build-aux/gen-debug-table -o $@ $^ @@ -210,8 +208,6 @@ linker-script.lua-utils: $(libmurphy_lua_utils_la_HEADERS) clean-linker-script:: -rm -f linker-script.lua-utils -generate-linker-scripts: linker-script.lua-utils - ################################### # murphy lua decision network # @@ -271,8 +267,6 @@ linker-script.lua-decision: $(libmurphy_lua_decision_la_HEADERS) clean-linker-script:: -rm -f linker-script.lua-decision -generate-linker-scripts: linker-script.lua-decision - ################################### # murphy core library # @@ -374,8 +368,6 @@ linker-script.core: $(libmurphy_core_la_HEADERS) \ clean-linker-script:: -rm -f linker-script.core -generate-linker-scripts: linker-script.core - # debug file:line-function mapping generation core-func-info.c: $(libmurphy_core_la_REGULAR_SOURCES) $(QUIET_GEN)$(top_builddir)/build-aux/gen-debug-table -o $@ $^ @@ -480,9 +472,6 @@ linker-script.libdbus: $(murphy_libdbus_headers) clean-linker-script:: -rm -f linker-script.libdbus -generate-linker-scripts: linker-script.libdbus - - # libdbus-based library with full abstraction murphy_dbus_libdbus_headers = \ common/dbus-libdbus.h \ @@ -542,8 +531,6 @@ linker-script.dbus-libdbus: $(murphy_dbus_libdbus_headers) clean-linker-script:: -rm -f linker-script.dbus-libdbus -generate-linker-scripts: linker-script.dbus-libdbus - # systemd-bus based library murphy_dbus_sdbus_headers = \ common/dbus-sdbus.h \ @@ -602,9 +589,6 @@ linker-script.dbus-sdbus: $(murphy_dbus_sdbus_headers) clean-linker-script:: -rm -f linker-script.sd-bus -generate-linker-scripts: linker-script.sd-bus - - ################################### # murphy pulse glue library # @@ -653,8 +637,6 @@ linker-script.pulse: $(murphy_pulse_headers) clean-linker-script:: -rm -f linker-script.pulse -generate-linker-scripts: linker-script.pulse - ################################### # murphy ecore glue library # @@ -703,8 +685,6 @@ linker-script.ecore: $(murphy_ecore_headers) clean-linker-script:: -rm -f linker-script.ecore -generate-linker-scripts: linker-script.ecore - ################################### # murphy glib glue library # @@ -753,8 +733,6 @@ linker-script.glib: $(murphy_glib_headers) clean-linker-script:: -rm -f linker-script.glib -generate-linker-scripts: linker-script.glib - ################################### # murphy qt glue library # @@ -807,8 +785,6 @@ linker-script.qt: $(murphy_qt_headers) clean-linker-script:: -rm -f linker-script.qt -generate-linker-scripts: linker-script.qt - ################################### # murphy resolver library # @@ -891,8 +867,6 @@ linker-script.resolver: $(libmurphy_resolver_la_HEADERS) clean-linker-script:: -rm -f linker-script.resolver - -generate-linker-scripts: linker-script.resolver # simple interpreter lexical analyser and parser generation SIMPLE_PARSER_PREFIX = yy_smpl_ BUILT_SOURCES += resolver/scripting/simple/simple-scanner.c \ @@ -988,8 +962,6 @@ linker-script.resource_backend: $(libmurphy_resource_backend_la_HEADERS) clean-linker-script:: -rm -f linker-script.resource_backend -generate-linker-scripts: linker-script.resource_backend - ########################## # readline replacement # @@ -1031,8 +1003,6 @@ linker-script.breedline: $(libbreedline_la_HEADERS) clean-linker-script:: -rm -f linker-script.breedline -generate-linker-scripts: linker-script.breedline - ########################## # breedline murphy glue library # @@ -1069,8 +1039,6 @@ linker-script.breedline-murphy: $(libbreedline_murphy_la_HEADERS) clean-linker-script:: -rm -f linker-script.breedline-murphy -generate-linker-scripts: linker-script.breedline-murphy - ########################## # breedline glib glue library # @@ -1113,8 +1081,6 @@ linker-script.breedline-glib: $(breedline_glib_headers) clean-linker-script:: -rm -f linker-script.breedline-glib -generate-linker-scripts: linker-script.breedline-glib - ################################### # murphy resource external library @@ -1162,9 +1128,6 @@ linker-script.resource: $(libmurphy_resource_la_HEADERS) clean-linker-script:: -rm -f linker-script.resource -generate-linker-scripts: linker-script.resource - - # resource-api-test bin_PROGRAMS += resource-api-test @@ -1491,9 +1454,6 @@ linker-script.domain-control: $(DOMAIN_CONTROL_PLUGIN_LOADER:%.c=%.h) clean-linker-script:: -rm -f linker-script.domain-control -generate-linker-scripts: linker-script.domain-control - - # Lua plugin LUA_PLUGIN_SOURCES = plugins/plugin-lua.c LUA_PLUGIN_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) @@ -1630,9 +1590,6 @@ endif murphy_console_LDFLAGS = -rdynamic endif -generate-linker-scripts: - $(MAKE) -C murphy-db $@ - # cleanup clean-local:: # clean-linker-script clean-func-infos -rm -f *~ diff --git a/src/murphy-db/Makefile.am b/src/murphy-db/Makefile.am index dbd03fa..38d4a94 100644 --- a/src/murphy-db/Makefile.am +++ b/src/murphy-db/Makefile.am @@ -17,10 +17,5 @@ murphy-db.pc: murphy-db.pc.in -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ $< > $@ -generate-linker-scripts: - $(MAKE) -C mdb $@ - $(MAKE) -C mqi $@ - $(MAKE) -C mql $@ - clean-local: rm -f *~ murphy-db.pc diff --git a/src/murphy-db/mdb/Makefile.am b/src/murphy-db/mdb/Makefile.am index 33f251e..89a4875 100644 --- a/src/murphy-db/mdb/Makefile.am +++ b/src/murphy-db/mdb/Makefile.am @@ -43,8 +43,6 @@ $(LINKER_SCRIPT): $(libmdb_la_HEADERS) clean-$(LINKER_SCRIPT): -rm -f $(LINKER_SCRIPT) -generate-linker-scripts: $(LINKER_SCRIPT) - # cleanup clean-local:: # clean-$(LINKER_SCRIPT) -rm -f *~ diff --git a/src/murphy-db/mqi/Makefile.am b/src/murphy-db/mqi/Makefile.am index 3acad9b..c3c9f07 100644 --- a/src/murphy-db/mqi/Makefile.am +++ b/src/murphy-db/mqi/Makefile.am @@ -29,8 +29,6 @@ $(LINKER_SCRIPT): $(libmqi_la_HEADERS) clean-$(LINKER_SCRIPT): -rm -f $(LINKER_SCRIPT) -generate-linker-scripts: $(LINKER_SCRIPT) - # cleanup clean-local:: # clean-$(LINKER_SCRIPT) rm -f *~ diff --git a/src/murphy-db/mql/Makefile.am b/src/murphy-db/mql/Makefile.am index afe838a..247cae1 100644 --- a/src/murphy-db/mql/Makefile.am +++ b/src/murphy-db/mql/Makefile.am @@ -56,8 +56,6 @@ $(LINKER_SCRIPT): $(libmql_la_HEADERS) clean-$(LINKER_SCRIPT): -rm -f $(LINKER_SCRIPT) -generate-linker-scripts: $(LINKER_SCRIPT) - # cleanup clean-local:: clean-parser clean-scanner # clean-$(LINKER_SCRIPT) rm -f *~ -- 2.7.4