Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-inst / makefile

diff --git a/apt-inst/makefile b/apt-inst/makefile
index 0b02d4c7931ff4a46486d7d8d02d532e87531ef5..e4a3ae7029e640998b0ce8cdcfc41c4f49a186a9 100644 (file)
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -9,24 +9,18 @@ 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 and version (indirectly used from init.h)
+include ../buildlib/libversion.mak
+

 # The library name
 LIBRARY=apt-inst
 # The library name
 LIBRARY=apt-inst

-LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=1.0
+MAJOR=1.6

 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 APT_DOMAIN:=libapt-inst$(MAJOR)
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 APT_DOMAIN:=libapt-inst$(MAJOR)

+LIBRARYDEPENDS=$(LIB)/libapt-pkg.so

 
 

-# Source code for the contributed non-core things
-SOURCE = contrib/extracttar.cc contrib/arfile.cc
-
-# Source code for the main library
-SOURCE+= filelist.cc database.cc dirstream.cc extract.cc \
-         deb/dpkgdb.cc deb/debfile.cc
-
-# Public header files
-HEADERS = extracttar.h arfile.h filelist.h database.h extract.h \
-          dpkgdb.h dirstream.h debfile.h
+SOURCE = $(wildcard *.cc */*.cc)
+HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))

 
 

-HEADERS := $(addprefix apt-pkg/,$(HEADERS))

 include $(LIBRARY_H)
 include $(LIBRARY_H)