Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-private / makefile

diff --git a/apt-private/makefile b/apt-private/makefile
index 9b074f1897027b2a8285ab8b990d58d370cecdff..9a3fbdb2998f534d1fc94b8d0fb1d5507094f071 100644 (file)
--- a/apt-private/makefile
+++ b/apt-private/makefile
@@ -8,21 +8,14 @@ HEADER_TARGETDIRS = apt-private
 # 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-private
 MAJOR=0.0
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 # The library name
 LIBRARY=apt-private
 MAJOR=0.0
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg

+CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden

 
 

-PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main progress
-SOURCE += $(foreach private, $(PRIVATES), private-$(private).cc)
-HEADERS += $(foreach private, $(PRIVATES), private-$(private).h)
-
-SOURCE+= acqprogress.cc
-HEADERS+= acqprogress.h private-cacheset.h
+SOURCE = $(wildcard *.cc)
+HEADERS = $(addprefix apt-private/,$(wildcard *.h))

 
 

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

 include $(LIBRARY_H)
 include $(LIBRARY_H)