summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2008-08-13 09:24:08 -0400
committerFrank Ch. Eigler <fche@elastic.org>2008-08-13 09:24:08 -0400
commitb01369baab6f5bd6887e99ad44048197e0d38c04 (patch)
tree3d9b6ceccc5a75ce3683de49a528a69f6e464ae5
parent113187f4bef412a250736468b93e9a553d04d91b (diff)
downloadsystemtap-steved-b01369baab6f5bd6887e99ad44048197e0d38c04.tar.gz
systemtap-steved-b01369baab6f5bd6887e99ad44048197e0d38c04.tar.xz
systemtap-steved-b01369baab6f5bd6887e99ad44048197e0d38c04.zip
build compatibility and speed hack for bundled-elfutils mode
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am4
-rw-r--r--Makefile.in4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c7b49da..b51ea6a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-13 Frank Ch. Eigler <fche@elastic.org>
+
+ * Makefile.am (stamp-elfutils): Override build-elfutils'
+ bin_PROGRAMS to not bother build binaries we're not using.
+ * Makefile.in: Regenerated.
+
2008-08-12 Frank Ch. Eigler <fche@elastic.org>
* buildrun.cxx (compile_pass): Add ugly kbuild hack for hand-built
diff --git a/Makefile.am b/Makefile.am
index e6a5654c..05da9fad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,9 +85,9 @@ stap_LDFLAGS += -Llib-elfutils -Wl,-rpath-link,lib-elfutils \
BUILT_SOURCES += stamp-elfutils
CLEANFILES += stamp-elfutils
stamp-elfutils: config.status
- $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all
+ $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all bin_PROGRAMS=
for dir in libelf libebl libdw libdwfl backends; do \
- $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils/$$dir install; \
+ $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils/$$dir bin_PROGRAMS= install; \
done
touch $@
stap_DEPENDENCIES = lib-elfutils/libdw.so
diff --git a/Makefile.in b/Makefile.in
index 4ed771e8..9de49415 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1530,9 +1530,9 @@ cscope:
(echo -q ; git ls-files '*.cxx' '*.c' '*.h' | grep -v '^testsuite' ) > cscope.files && \
cscope -b -q
@BUILD_ELFUTILS_TRUE@stamp-elfutils: config.status
-@BUILD_ELFUTILS_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all
+@BUILD_ELFUTILS_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils all bin_PROGRAMS=
@BUILD_ELFUTILS_TRUE@ for dir in libelf libebl libdw libdwfl backends; do \
-@BUILD_ELFUTILS_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils/$$dir install; \
+@BUILD_ELFUTILS_TRUE@ $(MAKE) $(AM_MAKEFLAGS) -C build-elfutils/$$dir bin_PROGRAMS= install; \
@BUILD_ELFUTILS_TRUE@ done
@BUILD_ELFUTILS_TRUE@ touch $@
@BUILD_ELFUTILS_TRUE@lib-elfutils/libdw.so: stamp-elfutils ;