Merge with Matt

[apt.git] / test / makefile

diff --git a/test/makefile b/test/makefile
index 31d67d46c916dec2244bcfbbc19ed18b0d58d7fb..a9dbdc34dfb9935ef92a20f96373b23a3cff3c14 100644 (file)
--- a/test/makefile
+++ b/test/makefile
@@ -24,12 +24,6 @@ LIB_MAKES = apt-pkg/makefile apt-inst/makefile
 SOURCE = scratch.cc
 include $(PROGRAM_H)
 
-PROGRAM=testextract
-SLIBS = -lapt-inst -lapt-pkg
-LIB_MAKES = apt-pkg/makefile apt-inst/makefile
-SOURCE = testextract.cc
-include $(PROGRAM_H)
-
 # Version compare tester
 PROGRAM=versiontest
 SLIBS = -lapt-pkg 
@@ -38,15 +32,44 @@ SOURCE = versiontest.cc
 include $(PROGRAM_H)
 
 # Version compare tester
-PROGRAM=srcrfind
+PROGRAM=testextract
+SLIBS = -lapt-pkg -lapt-inst
+LIB_MAKES = apt-pkg/makefile apt-inst/makefile
+SOURCE = testextract.cc
+include $(PROGRAM_H)
+
+# Program for testing the config file parser
+PROGRAM=conftest_clear
+SLIBS = -lapt-pkg
+SOURCE = conf_clear.cc
+include $(PROGRAM_H)
+
+# Program for testing the config file parser
+PROGRAM=conftest
+SLIBS = -lapt-pkg
+SOURCE = conf.cc
+include $(PROGRAM_H)
+
+# Program for testing the tar/deb extractor
+PROGRAM=testdeb
+SLIBS = -lapt-pkg -lapt-inst
+SOURCE = testdeb.cc
+include $(PROGRAM_H)
+
+# Program for testing tar extraction
+PROGRAM=extract-control
+SLIBS = -lapt-pkg -lapt-inst
+SOURCE = extract-control.cc
+include $(PROGRAM_H)
+
+# Program for testing hashes
+PROGRAM=hash
 SLIBS = -lapt-pkg 
-LIB_MAKES = apt-pkg/makefile
-SOURCE = srcrfind.cc
+SOURCE = hash.cc
 include $(PROGRAM_H)
 
-# Control Extracter tester
-PROGRAM=extractcontrol
-SLIBS = -lapt-pkg -lapt-inst -ldb2
-LIB_MAKES = apt-pkg/makefile
-SOURCE = extractcontrol.cc
+# Program for checking rpm versions
+PROGRAM=rpmver
+SLIBS = -lapt-pkg -lrpm
+SOURCE = rpmver.cc
 include $(PROGRAM_H)