diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-25 13:51:50 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-25 13:51:50 +0200 |
| commit | 15ccc2a685b0b884b393e356f9960e86f97f532d (patch) | |
| tree | 920a1fcf6fa2c92a05d0d1d2ccb22eb32b88522e /apt-private/makefile | |
| parent | a40c6649b99814c7d30964accdd5ecc4f1ce369a (diff) | |
| parent | 506ab3c78fb67f5e452a1748f4870af767de5ebb (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'apt-private/makefile')
| -rw-r--r-- | apt-private/makefile | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/apt-private/makefile b/apt-private/makefile index 09736c6d3..9a3fbdb29 100644 --- a/apt-private/makefile +++ b/apt-private/makefile @@ -8,9 +8,6 @@ HEADER_TARGETDIRS = apt-private # 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 @@ -18,12 +15,7 @@ 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 utils sources -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) |