add a way to add packages to generate a dists style environment without

[apt.git] / methods / makefile

diff --git a/methods/makefile b/methods/makefile
index 4345307e22bfd7eac4d841b14568b47ec7fea1dc..d94a853401e74484d81a3730c3b82595670ced34 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -6,44 +6,105 @@ SUBDIR=methods
 include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
 include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 

+include ../buildlib/libversion.mak
+APT_DOMAIN := libapt-pkg$(LIBAPTPKG_MAJOR)
+

 # The file method
 PROGRAM=file
 # The file method
 PROGRAM=file

-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = file.cc
 include $(PROGRAM_H)
 
 # The copy method
 PROGRAM=copy
 LIB_MAKES = apt-pkg/makefile
 SOURCE = file.cc
 include $(PROGRAM_H)
 
 # The copy method
 PROGRAM=copy

-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = copy.cc
 include $(PROGRAM_H)
 
 # The gzip method
 PROGRAM=gzip
 LIB_MAKES = apt-pkg/makefile
 SOURCE = copy.cc
 include $(PROGRAM_H)
 
 # The gzip method
 PROGRAM=gzip

-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = gzip.cc
 include $(PROGRAM_H)
 
 LIB_MAKES = apt-pkg/makefile
 SOURCE = gzip.cc
 include $(PROGRAM_H)
 

+# The gpgv method
+PROGRAM=gpgv
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = gpgv.cc
+include $(PROGRAM_H)
+

 # The cdrom method
 PROGRAM=cdrom
 # The cdrom method
 PROGRAM=cdrom

-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg -ldl $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)
 
 # The http method
 PROGRAM=http
 LIB_MAKES = apt-pkg/makefile
 SOURCE = cdrom.cc
 include $(PROGRAM_H)
 
 # The http method
 PROGRAM=http

-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc
+include $(PROGRAM_H)
+
+# The https method
+PROGRAM=https
+SLIBS = -lapt-pkg -lcurl $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 LIB_MAKES = apt-pkg/makefile

-SOURCE = http.cc rfc2553emu.cc
+SOURCE = https.cc

 include $(PROGRAM_H)
 
 # The ftp method
 PROGRAM=ftp
 include $(PROGRAM_H)
 
 # The ftp method
 PROGRAM=ftp

-SLIBS = -lapt-pkg 
+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = ftp.cc rfc2553emu.cc connect.cc
+include $(PROGRAM_H)
+
+# The rred method
+PROGRAM=rred
+SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)

 LIB_MAKES = apt-pkg/makefile
 LIB_MAKES = apt-pkg/makefile

-SOURCE = ftp.cc rfc2553emu.cc
+SOURCE = rred.cc

 include $(PROGRAM_H)
 include $(PROGRAM_H)

+
+# The rsh method
+PROGRAM=rsh
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = rsh.cc
+include $(PROGRAM_H)
+
+# The mirror method
+PROGRAM=mirror
+SLIBS = -lapt-pkg $(SOCKETLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = mirror.cc http.cc rfc2553emu.cc connect.cc
+include $(PROGRAM_H)
+
+# The gzip method
+PROGRAM=bzip2
+SLIBS = -lapt-pkg $(INTLLIBS)
+LIB_MAKES = apt-pkg/makefile
+SOURCE = bzip2.cc
+include $(PROGRAM_H)
+
+# SSH and lzma method symlink
+binary: $(BIN)/ssh $(BIN)/lzma
+veryclean: clean-$(BIN)/ssh clean-$(BIN)/lzma
+
+$(BIN)/ssh:
+       echo "Installing ssh method link"
+       ln -fs rsh $(BIN)/ssh
+clean-$(BIN)/ssh:
+       -rm $(BIN)/ssh
+
+$(BIN)/lzma:
+       echo "Installing lzma method link"
+       ln -fs bzip2 $(BIN)/lzma
+clean-$(BIN)/lzma:
+       -rm $(BIN)/lzma