diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
| commit | 38d2959ffb8c6f5f291b2910014a67b1b352ab4c (patch) | |
| tree | c5977b8f34aaf973ed3956952ec3ff43ac59f143 /apt-inst/makefile | |
| parent | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (diff) | |
| parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
Diffstat (limited to 'apt-inst/makefile')
| -rw-r--r-- | apt-inst/makefile | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/apt-inst/makefile b/apt-inst/makefile index da983df5f..af887bba8 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -20,15 +20,7 @@ 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) |