Browse Source

use wildcard to get files in our library makefiles

The explicit listing is a pain every time you want to add a file to the
list and serves no propose as we list all files there anyway, so this is
not only easier but also documents this fact.

Git-Dch: Ignore
debian/1.8.y
David Kalnischkies 8 years ago
parent
commit
53c3a8fa16
  1. 12
      apt-inst/makefile
  2. 48
      apt-pkg/makefile
  3. 12
      apt-private/makefile

12
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)

48
apt-pkg/makefile

@ -11,6 +11,7 @@ include ../buildlib/defaults.mak
# The library name and version (indirectly used from init.h)
include ../buildlib/libversion.mak
LIBRARY=apt-pkg
MAJOR=$(LIBAPTPKG_MAJOR)
MINOR=$(LIBAPTPKG_RELEASE)
@ -26,50 +27,7 @@ SLIBS+= -llzma
endif
APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
# Source code for the contributed non-core things
SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \
contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \
contrib/hashsum.cc contrib/md5.cc contrib/sha1.cc \
contrib/sha2_internal.cc contrib/hashes.cc \
contrib/cdromutl.cc contrib/crc-16.cc contrib/netrc.cc \
contrib/fileutl.cc contrib/gpgv.cc
HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h netrc.h \
md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha2.h sha256.h \
sha2_internal.h hashes.h hashsum_template.h \
macros.h weakptr.h gpgv.h
# Source code for the core main library
SOURCE+= pkgcache.cc version.cc depcache.cc \
orderlist.cc tagfile.cc sourcelist.cc packagemanager.cc \
pkgrecords.cc algorithms.cc acquire.cc\
acquire-worker.cc acquire-method.cc init.cc clean.cc \
srcrecords.cc cachefile.cc versionmatch.cc policy.cc \
pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \
indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \
aptconfiguration.cc cachefilter.cc cacheset.cc edsp.cc \
install-progress.cc upgrade.cc update.cc
HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \
orderlist.h sourcelist.h packagemanager.h tagfile.h \
init.h pkgcache.h version.h progress.h pkgrecords.h \
acquire.h acquire-worker.h acquire-item.h acquire-method.h \
clean.h srcrecords.h cachefile.h versionmatch.h policy.h \
pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \
vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \
cachefilter.h cacheset.h edsp.h install-progress.h \
upgrade.h update.h
# Source code for the debian specific components
# In theory the deb headers do not need to be exported..
SOURCE+= deb/deblistparser.cc deb/debrecords.cc deb/dpkgpm.cc \
deb/debsrcrecords.cc deb/debversion.cc deb/debsystem.cc \
deb/debindexfile.cc deb/debindexfile.cc deb/debmetaindex.cc
HEADERS+= debversion.h debsrcrecords.h dpkgpm.h debrecords.h \
deblistparser.h debsystem.h debindexfile.h debmetaindex.h
# Source code for the APT resolver interface specific components
SOURCE+= edsp/edsplistparser.cc edsp/edspindexfile.cc edsp/edspsystem.cc
HEADERS+= edsplistparser.h edspindexfile.h edspsystem.h
HEADERS := $(addprefix apt-pkg/,$(HEADERS))
SOURCE = $(wildcard *.cc */*.cc)
HEADERS = $(addprefix apt-pkg/,$(notdir $(wildcard *.h */*.h)))
include $(LIBRARY_H)

12
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)

Loading…
Cancel
Save