releasing package apt version 1.0.5

[apt.git] / apt-pkg / makefile

diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 3a51849ba8fcc3ed020ce4fdf2dc7894fab0bf31..5603b51ed82216666e66c3b2ea2e7715925fe2f3 100644 (file)
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -3,55 +3,31 @@ BASE=..
 SUBDIR=apt-pkg
 
 # Header location
 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
 
 HEADER_TARGETDIRS = apt-pkg
 
 # 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
-LIBRARY=apt-pkg
-LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=3.3
-MINOR=0
-SLIBS=$(PTHREADLIB)
-DOMAIN:=libapt-pkg$(MAJOR)
-
-# 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/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 \
-        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
-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
+# The library name and version (indirectly used from init.h)
+include ../buildlib/libversion.mak

 
 

-# 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
-HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
-         deblistparser.h debsystem.h debindexfile.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)
 
 include $(LIBRARY_H)