rename ReOwn to ReMap in the cacheiterators

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index f2a8460a9e64e9336c72bb194d6305fa40c3b321..2a79585368eacb5f8a89532525cf37caa35808e6 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -9,14 +9,13 @@ 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, don't forget to update init.h and the copy in 
-# methods/makefile - FIXME
+# The library name and version (indirectly used from init.h)
+include ../buildlib/libversion.mak

 LIBRARY=apt-pkg
 LIBRARY=apt-pkg

-LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=4.8
-MINOR=1
-SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl
-APT_DOMAIN:=libapt-pkg$(MAJOR)
+MAJOR=$(LIBAPTPKG_MAJOR)
+MINOR=$(LIBAPTPKG_RELEASE)
+SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl -lz
+APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_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 \


@@ -25,7 +24,8 @@ SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
         contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
         contrib/fileutl.cc 
 HEADERS = mmap.h error.h configuration.h fileutl.h  cmndline.h netrc.h\
         contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
         contrib/fileutl.cc 
 HEADERS = mmap.h error.h configuration.h fileutl.h  cmndline.h netrc.h\

-         md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h 
+         md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h \
+         macros.h weakptr.h

 
 # Source code for the core main library
 SOURCE+= pkgcache.cc version.cc depcache.cc \
 
 # Source code for the core main library
 SOURCE+= pkgcache.cc version.cc depcache.cc \


@@ -42,7 +42,7 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.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 \
          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 cdrom.h indexcopy.h aptconfiguration.h
+         vendorlist.h cdrom.h indexcopy.h aptconfiguration.h

 
 # Source code for the debian specific components
 # In theory the deb headers do not need to be exported..
 
 # Source code for the debian specific components
 # In theory the deb headers do not need to be exported..


@@ -54,7 +54,4 @@ HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
 
 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 
 
 HEADERS := $(addprefix apt-pkg/,$(HEADERS))
 

-# Private header files
-HEADERS+= system.h
-

 include $(LIBRARY_H)
 include $(LIBRARY_H)