releasing package apt version 1.0.5

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 80bfbdcf3f042a94084dc73ab7686c10b53b1d5b..5603b51ed82216666e66c3b2ea2e7715925fe2f3 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -3,46 +3,31 @@ BASE=..
 SUBDIR=apt-pkg
 
 # Header location
-SUBDIRS = deb contrib
+SUBDIRS = deb edsp contrib
 HEADER_TARGETDIRS = apt-pkg
 
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-# The library name
-LIBRARY=apt-pkg
-MAJOR=2.3
-MINOR=0
-SLIBS=$(PTHREADLIB)
-
-# 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 \
-        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 \
-        pkgrecords.cc algorithms.cc acquire.cc acquire-item.cc \
-        acquire-worker.cc acquire-method.cc init.cc clean.cc \
-        srcrecords.cc cachefile.cc
-
-# Source code for the debian specific components
-SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc deb/dpkginit.cc \
-         deb/debsrcrecords.cc
+# The library name and version (indirectly used from init.h)
+include ../buildlib/libversion.mak
 
-# 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 md5.h \
-         dpkgpm.h dpkginit.h cdromutl.h strutl.h clean.h srcrecords.h \
-         debsrcrecords.h cachefile.h
-
-HEADERS := $(addprefix apt-pkg/,$(HEADERS))
-
-# Private header files
-HEADERS+= system.h
+LIBRARY=apt-pkg
+MAJOR=$(LIBAPTPKG_MAJOR)
+MINOR=$(LIBAPTPKG_RELEASE)
+SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl
+ifeq ($(HAVE_ZLIB),yes)
+SLIBS+= -lz
+endif
+ifeq ($(HAVE_BZ2),yes)
+SLIBS+= -lbz2
+endif
+ifeq ($(HAVE_LZMA),yes)
+SLIBS+= -llzma
+endif
+APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
+
+SOURCE = $(wildcard *.cc */*.cc)
+HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))
 
 include $(LIBRARY_H)