1 files changed, 14 insertions, 30 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 822d17a33..c76c5fc6d 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,41 +1,25 @@
 ROOTDEST    = /export
-DEST        = $(ROOTDEST)/Mandrake/mdkinst
-RPMS        = $(wildcard $(ROOTDEST)/Mandrake/RPMS/*.rpm)
-DIRS	    = ddcprobe serial_probe
 BASE        = $(ROOTDEST)/Mandrake/base
-CFLAGS      = -Wall
 
-.PHONY: clean install $(DIRS)
-
-all: $(BASE)/depslist $(BASE)/filelist $(BASE)/compss $(DIRS) xhost+ install
-
-$(DIRS):
-	make -C $@
+ALL = gendepslist rpm2header
+.PHONY: clean install
 
 install:
-	install make_mdkinst_stage2 gencompss $(ROOTDEST)/misc
-	cd /usr/bin ; install build_archive $(ROOTDEST)/misc || { echo "build_archive is missing"; exit 1; }
-	cd /usr/bin ; install gendepslist2 rpm2header genhdlist_cz2 $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; }
-	mkdir -p $(DEST)/usr/bin
-
-xhost+: %: %.c
-	$(CC) $(CFLAGS) $< -L/usr/X11R6/lib -lX11 -o $@
-
-ddcprobe/ddcxinfos:
-	$(MAKE) -C ddcprobe ddcxinfos
+	$(MAKE) gendepslist rpm2header
+	install make_mdkinst_stage2 gendepslist rpm2header genhdlist $(ROOTDEST)/misc
 
-$(BASE)/compss: $(BASE)/hdlists $(BASE)/hdlist.cz2
-	./gencompss `cat $< | perl -pe 's|(.*)|'$(BASE)'/$$1|' ` > $@ 
+gendepslist: %: %.cc 
+	$(CXX) -I/usr/include/rpm $(CFLAGS) $< -lrpm -ldb1 -lz -o $@
 
-$(BASE)/depslist: $(BASE)/hdlists $(BASE)/hdlist.cz2
-#	gendepslist2 -o $@ `cat $< | perl -pe 's|^(\S*).*|'$(BASE)'/$$1|' `
+rpm2header: %: %.c
+	$(CC) -I/usr/include/rpm $(CFLAGS) $< -lrpm -ldb1 -lz -o $@
 
-$(BASE)/filelist: $(RPMS)
-#	genfilelist $(ROOTDEST)/Mandrake/RPMS* >$@
+$(BASE)/depslist: $(BASE)/hdlist gendepslist
+	./gendepslist -h $@ $<
 
-$(BASE)/hdlist.cz2: $(BASE)/hdlists $(RPMS)
-#	genhdlists --noclean --distrib $(ROOTDEST)
+$(BASE)/hdlist: $(RPMS)
+	$(MAKE) install
+	./genhdlist $(ROOTDEST)
 
 clean: 
-	for i in $(DIRS); do $(MAKE) -C $$i clean; done
-	rm -rf *~ xhost+ ddcprobe/ddcxinfos */*.o
+	rm -rf *~ gendepslist rpm2header