--- rpm-4.4.1/tools/Makefile.in.debug	2005-08-26 19:53:47.000000000 +0400
+++ rpm-4.4.1/tools/Makefile.in	2005-08-26 19:56:25.000000000 +0400
@@ -16,7 +16,7 @@
 
 # Makefile for rpm tools.
 
-SOURCES = $(convertdb1_SOURCES) $(debugedit_SOURCES) dumpdb.c $(javadeps_SOURCES) $(rpmcache_SOURCES) $(rpmdeps_SOURCES) $(rpmfile_SOURCES) $(rpmgraph_SOURCES) $(rpminject_SOURCES) $(rpmsort_SOURCES) $(rpmtool_SOURCES) $(rpmxml_SOURCES)
+SOURCES = $(convertdb1_SOURCES) dumpdb.c $(javadeps_SOURCES) $(rpmcache_SOURCES) $(rpmdeps_SOURCES) $(rpmfile_SOURCES) $(rpmgraph_SOURCES) $(rpminject_SOURCES) $(rpmsort_SOURCES) $(rpmtool_SOURCES) $(rpmxml_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -41,11 +41,11 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-EXTRA_PROGRAMS = debugedit$(EXEEXT) convertdb1$(EXEEXT) \
+EXTRA_PROGRAMS = convertdb1$(EXEEXT) \
 	rpminject$(EXEEXT) rpmsort$(EXEEXT) rpmtool$(EXEEXT) \
 	rpmxml$(EXEEXT)
 noinst_PROGRAMS = dumpdb$(EXEEXT)
-pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps$(EXEEXT) \
+pkgbin_PROGRAMS = javadeps$(EXEEXT) \
 	rpmcache$(EXEEXT) rpmdeps$(EXEEXT) rpmfile$(EXEEXT)
 bin_PROGRAMS = rpmgraph$(EXEEXT)
 subdir = tools
@@ -65,9 +65,6 @@
 convertdb1_OBJECTS = $(am_convertdb1_OBJECTS)
 convertdb1_LDADD = $(LDADD)
 convertdb1_DEPENDENCIES = $(top_builddir)/lib/librpm.la
-am_debugedit_OBJECTS = debugedit.$(OBJEXT) hashtab.$(OBJEXT)
-debugedit_OBJECTS = $(am_debugedit_OBJECTS)
-debugedit_DEPENDENCIES = $(top_builddir)/popt/libpopt.la
 dumpdb_SOURCES = dumpdb.c
 dumpdb_OBJECTS = dumpdb.$(OBJEXT)
 dumpdb_LDADD = $(LDADD)
@@ -116,11 +113,11 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(convertdb1_SOURCES) $(debugedit_SOURCES) dumpdb.c \
+SOURCES = $(convertdb1_SOURCES) dumpdb.c \
 	$(javadeps_SOURCES) $(rpmcache_SOURCES) $(rpmdeps_SOURCES) \
 	$(rpmfile_SOURCES) $(rpmgraph_SOURCES) $(rpminject_SOURCES) \
 	$(rpmsort_SOURCES) $(rpmtool_SOURCES) $(rpmxml_SOURCES)
-DIST_SOURCES = $(convertdb1_SOURCES) $(debugedit_SOURCES) dumpdb.c \
+DIST_SOURCES = $(convertdb1_SOURCES) dumpdb.c \
 	$(javadeps_SOURCES) $(rpmcache_SOURCES) $(rpmdeps_SOURCES) \
 	$(rpmfile_SOURCES) $(rpmgraph_SOURCES) $(rpminject_SOURCES) \
 	$(rpmsort_SOURCES) $(rpmtool_SOURCES) $(rpmxml_SOURCES)
@@ -253,7 +250,6 @@
 WITH_DB_SUBDIR = @WITH_DB_SUBDIR@
 WITH_ELFUTILS_SUBDIR = @WITH_ELFUTILS_SUBDIR@
 WITH_INTERNAL_DB = @WITH_INTERNAL_DB@
-WITH_LIBDWARF_DEBUGEDIT = @WITH_LIBDWARF_DEBUGEDIT@
 WITH_LIBDWARF_INCLUDE = @WITH_LIBDWARF_INCLUDE@
 WITH_LIBELF_INCLUDE = @WITH_LIBELF_INCLUDE@
 WITH_LIBELF_LIB = @WITH_LIBELF_LIB@
@@ -382,9 +378,6 @@
 pkgbindir = @RPMCONFIGDIR@
 MAGIC = $(pkgbindir)/magic
 convertdb1_SOURCES = convertdb1.c
-debugedit_SOURCES = debugedit.c hashtab.c
-debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
-	$(top_builddir)/popt/libpopt.la
 
 javadeps_SOURCES = javadeps.c
 rpmcache_SOURCES = rpmcache.c
@@ -509,9 +502,6 @@
 convertdb1$(EXEEXT): $(convertdb1_OBJECTS) $(convertdb1_DEPENDENCIES) 
 	@rm -f convertdb1$(EXEEXT)
 	$(LINK) $(convertdb1_LDFLAGS) $(convertdb1_OBJECTS) $(convertdb1_LDADD) $(LIBS)
-debugedit$(EXEEXT): $(debugedit_OBJECTS) $(debugedit_DEPENDENCIES) 
-	@rm -f debugedit$(EXEEXT)
-	$(LINK) $(debugedit_LDFLAGS) $(debugedit_OBJECTS) $(debugedit_LDADD) $(LIBS)
 dumpdb$(EXEEXT): $(dumpdb_OBJECTS) $(dumpdb_DEPENDENCIES) 
 	@rm -f dumpdb$(EXEEXT)
 	$(LINK) $(dumpdb_LDFLAGS) $(dumpdb_OBJECTS) $(dumpdb_LDADD) $(LIBS)
@@ -550,7 +540,6 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convertdb1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debugedit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dumpdb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtab.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/javadeps.Po@am__quote@