summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2008-12-26 13:25:32 -0500
committerDave Brolley <brolley@redhat.com>2008-12-26 13:25:32 -0500
commit1389c979109b8e3f1b66a4e5b88dafaaa84dd8ef (patch)
treed42c2df5ebcb6481a2a206d3ee931f8002222d58
parent46a8c85fde5ba9bcf4fa55e8f435959af4d32fea (diff)
downloadsystemtap-steved-1389c979109b8e3f1b66a4e5b88dafaaa84dd8ef.tar.gz
systemtap-steved-1389c979109b8e3f1b66a4e5b88dafaaa84dd8ef.tar.xz
systemtap-steved-1389c979109b8e3f1b66a4e5b88dafaaa84dd8ef.zip
Disable automatic building of stamp-ssl for now.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am4
-rw-r--r--Makefile.in7
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index da9afc34..866816af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-26 Dave Brolley <brolley@redhat.com>
+
+ * Makefile.am (stamp-ssl): Disable automake building of this target.
+ * Makefile.in: Regenerated.
+
2008-12-24 Dave Brolley <brolley@redhat.com>
* stap-client (netcat): Removed.
diff --git a/Makefile.am b/Makefile.am
index 9e927e56..d7a216dd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,12 +105,12 @@ install-elfutils:
install-exec-local: install-elfutils
endif
-BUILT_SOURCES += stamp-ssl
+#BUILT_SOURCES += stamp-ssl
CLEANFILES += stamp-ssl
stamp-ssl: config.status
$(srcdir)/stap-gen-server-cert ssl
touch $@
-stap_DEPENDENCIES += ssl/server/stap-server.cert
+#stap_DEPENDENCIES += ssl/server/stap-server.cert
ssl/server/stap-server.cert: stamp-ssl ;
staprun_SOURCES = runtime/staprun/staprun.c runtime/staprun/staprun_funcs.c\
diff --git a/Makefile.in b/Makefile.in
index 27996748..5b1690b8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -311,10 +311,12 @@ stap_LDADD = @stap_LIBS@ @sqlite3_LIBS@
# of foo-bar.c if it is newer than the foo-bar.o file. Using noinst_foo_SOURCES
# instead of foo_SOURCES prevents shipping git_version.h in dist tarballs,
# which may cause false GIT_FOO readings.
-BUILT_SOURCES = git_version.stamp $(am__append_3) stamp-ssl
+BUILT_SOURCES = git_version.stamp $(am__append_3)
+
+#BUILT_SOURCES += stamp-ssl
CLEANFILES = git_version.h $(am__append_4) stamp-ssl \
$(pkglibexec_PROGRAMS)
-stap_DEPENDENCIES = $(am__append_5) ssl/server/stap-server.cert
+stap_DEPENDENCIES = $(am__append_5)
GIT_VERSION_CMD = $(SHELL) $(top_srcdir)/git_version.sh
stap_CXXFLAGS = $(AM_CXXFLAGS)
stap_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1)
@@ -1490,6 +1492,7 @@ cscope:
stamp-ssl: config.status
$(srcdir)/stap-gen-server-cert ssl
touch $@
+#stap_DEPENDENCIES += ssl/server/stap-server.cert
ssl/server/stap-server.cert: stamp-ssl ;
install-exec-hook: