Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-inst / makefile

diff --git a/apt-inst/makefile b/apt-inst/makefile
index c716b8c9658908a86761a1a016a4654dae1dfcee..e4a3ae7029e640998b0ce8cdcfc41c4f49a186a9 100644 (file)
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -14,20 +14,13 @@ include ../buildlib/libversion.mak
 
 # The library name
 LIBRARY=apt-inst
 
 # The library name
 LIBRARY=apt-inst

-MAJOR=1.4
+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 = $(wildcard *.cc */*.cc)
+HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))

 
 

-# Source code for the main library
-SOURCE+= filelist.cc dirstream.cc extract.cc deb/debfile.cc
-
-# Public header files
-HEADERS = extracttar.h arfile.h filelist.h extract.h \
-          dirstream.h debfile.h
-
-HEADERS := $(addprefix apt-pkg/,$(HEADERS))

 include $(LIBRARY_H)
 include $(LIBRARY_H)