* merged changes from the conference

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 733196bbe4258b8c54e51b5ccdf3309fba02dfd2..e62a7efd526d94cbae8196c388f1327b6a5d0f43 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -9,35 +9,51 @@ HEADER_TARGETDIRS = apt-pkg
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
 # Bring in the default rules
 include ../buildlib/defaults.mak
 

-# The library name
+# The library name, don't forget to update init.h and the copy in 
+# methods/makefile - FIXME

 LIBRARY=apt-pkg
 LIBRARY=apt-pkg

-MAJOR=2.0
+LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
+MAJOR=3.7

 MINOR=0
 MINOR=0

-SLIBS=$(PTHREADLIB)
+SLIBS=$(PTHREADLIB) $(INTLLIBS)
+APT_DOMAIN:=libapt-pkg$(MAJOR)

 
 # 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/progress.cc contrib/cmndline.cc
-
-# Source code for the main library
-SOURCE+= pkgcache.cc version.cc fileutl.cc pkgcachegen.cc depcache.cc \
+         contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
+        contrib/md5.cc contrib/sha1.cc contrib/hashes.cc \
+        contrib/cdromutl.cc contrib/crc-16.cc \
+        contrib/fileutl.cc 
+HEADERS = mmap.h error.h configuration.h fileutl.h  cmndline.h \
+         md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h hashes.h
+
+# Source code for the core main library
+SOURCE+= pkgcache.cc version.cc depcache.cc \

          orderlist.cc tagfile.cc sourcelist.cc packagemanager.cc \
          orderlist.cc tagfile.cc sourcelist.cc packagemanager.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+= deb/deblistparser.cc deb/debrecords.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 \
-          version.h progress.h pkgrecords.h debrecords.h cmndline.h \
-         acquire.h acquire-worker.h acquire-item.h acquire-method.h
+        pkgrecords.cc algorithms.cc acquire.cc\
+        acquire-worker.cc acquire-method.cc init.cc clean.cc \
+        srcrecords.cc cachefile.cc versionmatch.cc policy.cc \
+        pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \
+        indexrecords.cc vendor.cc vendorlist.cc
+HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \
+         orderlist.h sourcelist.h packagemanager.h tagfile.h \
+         init.h pkgcache.h version.h progress.h pkgrecords.h \
+         acquire.h acquire-worker.h acquire-item.h acquire-method.h \
+         clean.h srcrecords.h cachefile.h versionmatch.h policy.h \
+         pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \
+          vendorlist.h
+
+# Source code for the debian specific components
+# In theory the deb headers do not need to be exported..
+SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc \
+         deb/debsrcrecords.cc deb/debversion.cc deb/debsystem.cc \
+        deb/debindexfile.cc deb/debindexfile.cc deb/debmetaindex.cc
+HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
+         deblistparser.h debsystem.h debindexfile.h debmetaindex.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)