Added some control over how dpkg is invoked

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index f6a5d003c897687db143ea424c37bdc0d39c0888..08b8b294119084651919a85f3bb63ff80b73cfa2 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -1,5 +1,6 @@
 # -*- make -*-
 BASE=..
 # -*- make -*-
 BASE=..

+SUBDIR=apt-pkg

 
 # Header location
 SUBDIRS = deb contrib
 
 # Header location
 SUBDIRS = deb contrib


@@ -10,29 +11,35 @@ include ../buildlib/defaults.mak
 
 # The library name
 LIBRARY=apt-pkg
 
 # The library name
 LIBRARY=apt-pkg

-MAJOR=2
-MINOR=0.0
+MAJOR=2.0
+MINOR=0
+SLIBS=$(PTHREADLIB)

 
 # Source code for the contributed non-core things
 SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
 
 # Source code for the contributed non-core things
 SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \

-         contrib/configuration.cc
-        
+         contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
+        contrib/md5.cc contrib/cdromutl.h
+

 # Source code for the main library
 SOURCE+= pkgcache.cc version.cc fileutl.cc pkgcachegen.cc depcache.cc \
          orderlist.cc tagfile.cc sourcelist.cc packagemanager.cc \
 # Source code for the main library
 SOURCE+= pkgcache.cc version.cc fileutl.cc pkgcachegen.cc depcache.cc \
          orderlist.cc tagfile.cc sourcelist.cc packagemanager.cc \

-        algorithms.cc init.cc templates.cc
-        
+        pkgrecords.cc algorithms.cc acquire.cc acquire-item.cc \
+        acquire-worker.cc acquire-method.cc init.cc templates.cc
+

 # Source code for the debian specific components        
 # Source code for the debian specific components        

-SOURCE+= deb/deblistparser.cc
+SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc deb/dpkginit.cc

 
 # Public apt-pkg header files
 HEADERS = algorithms.h depcache.h mmap.h pkgcachegen.h cacheiterators.h \
           error.h orderlist.h sourcelist.h configuration.h fileutl.h \
           packagemanager.h tagfile.h deblistparser.h init.h pkgcache.h \
 
 # Public apt-pkg header files
 HEADERS = algorithms.h depcache.h mmap.h pkgcachegen.h cacheiterators.h \
           error.h orderlist.h sourcelist.h configuration.h fileutl.h \
           packagemanager.h tagfile.h deblistparser.h init.h pkgcache.h \

-          version.h
+          version.h progress.h pkgrecords.h debrecords.h cmndline.h \
+         acquire.h acquire-worker.h acquire-item.h acquire-method.h md5.h \
+         dpkgpm.h dpkginit.h cdromutl.h strutl.h
+

 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 
 # Private header files
 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 
 # Private header files

-HEADERS+= strutl.h system.h
+HEADERS+= system.h

 
 include $(LIBRARY_H)
 
 include $(LIBRARY_H)