2007-08-15 Martin Hunt <hunt@redhat.com>

	* Makefile.am: Removed stap_merge.
	* Makefile.in: Rebuilt.

3 files changed, 11 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 867aec12..81e9fb0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-15  Martin Hunt  <hunt@redhat.com>
+
+	* Makefile.am: Removed stap_merge.
+	* Makefile.in: Rebuilt.
+
 2007-08-14  David Smith  <dsmith@redhat.com>
 
 	Merge from setuid-branch.  Changes also by Martin Hunt
diff --git a/Makefile.am b/Makefile.am
index 190d7456..9d50c6c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,15 +73,12 @@ install-exec-hook:
 pkglibexec_PROGRAMS = stapio
 CLEANFILES +=  $(pkglibexec_PROGRAMS)
 
-noinst_PROGRAMS = loc2c-test stap_merge
+noinst_PROGRAMS = loc2c-test
 loc2c_test_SOURCES = loc2c-test.c loc2c.c
 loc2c_test_CPPFLAGS = $(stap_CPPFLAGS)
 loc2c_test_LDFLAGS = $(stap_LDFLAGS)
 loc2c_test_LDADD = $(stap_LDADD)
 
-stap_merge_SOURCES = runtime/staprun/stap_merge.c
-stap_merge_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS)
-
 # crash(8) extension
 if BUILD_CRASHMOD
 STAPLOG=staplog.so
diff --git a/Makefile.in b/Makefile.in
index 4cd45712..a203dcc5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@ bin_PROGRAMS = stap$(EXEEXT) staprun$(EXEEXT)
 @BUILD_ELFUTILS_TRUE@am__append_3 = stamp-elfutils
 @BUILD_ELFUTILS_FALSE@stap_DEPENDENCIES =
 pkglibexec_PROGRAMS = stapio$(EXEEXT)
-noinst_PROGRAMS = loc2c-test$(EXEEXT) stap_merge$(EXEEXT)
+noinst_PROGRAMS = loc2c-test$(EXEEXT)
 @BUILD_LKET_B2A_TRUE@am__append_4 = runtime/lket/b2a
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@@ -102,10 +102,6 @@ am_stap_OBJECTS = stap-main.$(OBJEXT) stap-parse.$(OBJEXT) \
 	stap-hash.$(OBJEXT) stap-mdfour.$(OBJEXT) stap-cache.$(OBJEXT) \
 	stap-util.$(OBJEXT) stap-coveragedb.$(OBJEXT)
 stap_OBJECTS = $(am_stap_OBJECTS)
-am_stap_merge_OBJECTS = stap_merge-stap_merge.$(OBJEXT)
-stap_merge_OBJECTS = $(am_stap_merge_OBJECTS)
-stap_merge_LDADD = $(LDADD)
-stap_merge_DEPENDENCIES =
 am_stapio_OBJECTS = stapio-stapio.$(OBJEXT) stapio-mainloop.$(OBJEXT) \
 	stapio-common.$(OBJEXT) stapio-ctl.$(OBJEXT) \
 	stapio-relay.$(OBJEXT) stapio-relay_old.$(OBJEXT)
@@ -129,10 +125,10 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
-SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) $(stap_merge_SOURCES) \
-	$(stapio_SOURCES) $(staprun_SOURCES)
-DIST_SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) \
-	$(stap_merge_SOURCES) $(stapio_SOURCES) $(staprun_SOURCES)
+SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) $(stapio_SOURCES) \
+	$(staprun_SOURCES)
+DIST_SOURCES = $(loc2c_test_SOURCES) $(stap_SOURCES) $(stapio_SOURCES) \
+	$(staprun_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
 	install-exec-recursive install-info-recursive \
@@ -298,8 +294,6 @@ loc2c_test_SOURCES = loc2c-test.c loc2c.c
 loc2c_test_CPPFLAGS = $(stap_CPPFLAGS)
 loc2c_test_LDFLAGS = $(stap_LDFLAGS)
 loc2c_test_LDADD = $(stap_LDADD)
-stap_merge_SOURCES = runtime/staprun/stap_merge.c
-stap_merge_CFLAGS = @PROCFLAGS@ $(AM_CFLAGS)
 
 # crash(8) extension
 @BUILD_CRASHMOD_TRUE@STAPLOG = staplog.so
@@ -473,9 +467,6 @@ loc2c-test$(EXEEXT): $(loc2c_test_OBJECTS) $(loc2c_test_DEPENDENCIES)
 stap$(EXEEXT): $(stap_OBJECTS) $(stap_DEPENDENCIES) 
 	@rm -f stap$(EXEEXT)
 	$(CXXLINK) $(stap_LDFLAGS) $(stap_OBJECTS) $(stap_LDADD) $(LIBS)
-stap_merge$(EXEEXT): $(stap_merge_OBJECTS) $(stap_merge_DEPENDENCIES) 
-	@rm -f stap_merge$(EXEEXT)
-	$(LINK) $(stap_merge_LDFLAGS) $(stap_merge_OBJECTS) $(stap_merge_LDADD) $(LIBS)
 stapio$(EXEEXT): $(stapio_OBJECTS) $(stapio_DEPENDENCIES) 
 	@rm -f stapio$(EXEEXT)
 	$(LINK) $(stapio_LDFLAGS) $(stapio_OBJECTS) $(stapio_LDADD) $(LIBS)
@@ -504,7 +495,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-tapsets.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-translate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap_merge-stap_merge.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stapio-common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stapio-ctl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stapio-mainloop.Po@am__quote@
@@ -588,20 +578,6 @@ stap-mdfour.obj: mdfour.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stap_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o stap-mdfour.obj `if test -f 'mdfour.c'; then $(CYGPATH_W) 'mdfour.c'; else $(CYGPATH_W) '$(srcdir)/mdfour.c'; fi`
 
-stap_merge-stap_merge.o: runtime/staprun/stap_merge.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stap_merge_CFLAGS) $(CFLAGS) -MT stap_merge-stap_merge.o -MD -MP -MF "$(DEPDIR)/stap_merge-stap_merge.Tpo" -c -o stap_merge-stap_merge.o `test -f 'runtime/staprun/stap_merge.c' || echo '$(srcdir)/'`runtime/staprun/stap_merge.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/stap_merge-stap_merge.Tpo" "$(DEPDIR)/stap_merge-stap_merge.Po"; else rm -f "$(DEPDIR)/stap_merge-stap_merge.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/staprun/stap_merge.c' object='stap_merge-stap_merge.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stap_merge_CFLAGS) $(CFLAGS) -c -o stap_merge-stap_merge.o `test -f 'runtime/staprun/stap_merge.c' || echo '$(srcdir)/'`runtime/staprun/stap_merge.c
-
-stap_merge-stap_merge.obj: runtime/staprun/stap_merge.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stap_merge_CFLAGS) $(CFLAGS) -MT stap_merge-stap_merge.obj -MD -MP -MF "$(DEPDIR)/stap_merge-stap_merge.Tpo" -c -o stap_merge-stap_merge.obj `if test -f 'runtime/staprun/stap_merge.c'; then $(CYGPATH_W) 'runtime/staprun/stap_merge.c'; else $(CYGPATH_W) '$(srcdir)/runtime/staprun/stap_merge.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/stap_merge-stap_merge.Tpo" "$(DEPDIR)/stap_merge-stap_merge.Po"; else rm -f "$(DEPDIR)/stap_merge-stap_merge.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/staprun/stap_merge.c' object='stap_merge-stap_merge.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stap_merge_CFLAGS) $(CFLAGS) -c -o stap_merge-stap_merge.obj `if test -f 'runtime/staprun/stap_merge.c'; then $(CYGPATH_W) 'runtime/staprun/stap_merge.c'; else $(CYGPATH_W) '$(srcdir)/runtime/staprun/stap_merge.c'; fi`
-
 stapio-stapio.o: runtime/staprun/stapio.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stapio_CFLAGS) $(CFLAGS) -MT stapio-stapio.o -MD -MP -MF "$(DEPDIR)/stapio-stapio.Tpo" -c -o stapio-stapio.o `test -f 'runtime/staprun/stapio.c' || echo '$(srcdir)/'`runtime/staprun/stapio.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/stapio-stapio.Tpo" "$(DEPDIR)/stapio-stapio.Po"; else rm -f "$(DEPDIR)/stapio-stapio.Tpo"; exit 1; fi