Fixed make system to rebuild binaries when shlib versio...

Author: jgg
Date: 1999-04-12 04:28:46 GMT
Fixed make system to rebuild binaries when shlib version changes

diff --git a/buildlib/program.mak b/buildlib/program.mak
index 9a19a261fb450c5e7175f2242cc8909aad834448..fe0d30de3f855813851fe70d54a5613326d8b434 100644 (file)
--- a/buildlib/program.mak
+++ b/buildlib/program.mak
@@ -6,6 +6,8 @@
 # $(SOURCE) - The source code to use
 # $(PROGRAM) - The name of the program
 # $(SLIBS) - Shared libs to link against
 # $(SOURCE) - The source code to use
 # $(PROGRAM) - The name of the program
 # $(SLIBS) - Shared libs to link against

+# $(LIB_MAKES) - Shared libary make files to depend on - to ensure we get
+# remade when the shared library version increases.

 
 # See defaults.mak for information about LOCAL
 
 
 # See defaults.mak for information about LOCAL
 


@@ -15,6 +17,7 @@ $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .o,$(notdir $(basename $(SOURCE
 $(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .o.d,$(notdir $(basename $(SOURCE)))))
 $(LOCAL)-BIN := $(BIN)/$(PROGRAM)
 $(LOCAL)-SLIBS := $(SLIBS)
 $(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .o.d,$(notdir $(basename $(SOURCE)))))
 $(LOCAL)-BIN := $(BIN)/$(PROGRAM)
 $(LOCAL)-SLIBS := $(SLIBS)

+$(LOCAL)-MKS := $(addprefix $(BASE)/,$(LIB_MAKES))

 
 # Install the command hooks
 program: $(BIN)/$(PROGRAM)
 
 # Install the command hooks
 program: $(BIN)/$(PROGRAM)


@@ -29,7 +32,7 @@ veryclean/$(LOCAL): clean/$(LOCAL)
        -rm -f $($(@F)-BIN)
 
 # The binary build rule
        -rm -f $($(@F)-BIN)
 
 # The binary build rule

-$($(LOCAL)-BIN): $($(LOCAL)-OBJS)
+$($(LOCAL)-BIN): $($(LOCAL)-OBJS) $($(LOCAL)-MKS)

        echo Building program $@
        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)
 
        echo Building program $@
        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)
 

diff --git a/cmdline/makefile b/cmdline/makefile
index c3a4d81d91002f33da5e15bac570867a2fe49c9f..861976ec72c427b334de52adb362b6d8aee0fc82 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -8,23 +8,27 @@ include ../buildlib/defaults.mak
 # The apt-cache program
 PROGRAM=apt-cache
 SLIBS = -lapt-pkg
 # The apt-cache program
 PROGRAM=apt-cache
 SLIBS = -lapt-pkg

+LIB_MAKES = apt-pkg/makefile

 SOURCE = apt-cache.cc
 include $(PROGRAM_H)
 
 # The apt-get program
 PROGRAM=apt-get
 SLIBS = -lapt-pkg
 SOURCE = apt-cache.cc
 include $(PROGRAM_H)
 
 # The apt-get program
 PROGRAM=apt-get
 SLIBS = -lapt-pkg

+LIB_MAKES = apt-pkg/makefile

 SOURCE = apt-get.cc acqprogress.cc
 include $(PROGRAM_H)
 
 # The apt-config program
 PROGRAM=apt-config
 SLIBS = -lapt-pkg
 SOURCE = apt-get.cc acqprogress.cc
 include $(PROGRAM_H)
 
 # The apt-config program
 PROGRAM=apt-config
 SLIBS = -lapt-pkg

+LIB_MAKES = apt-pkg/makefile

 SOURCE = apt-config.cc
 include $(PROGRAM_H)
 
 # The apt-cdrom program
 PROGRAM=apt-cdrom
 SLIBS = -lapt-pkg
 SOURCE = apt-config.cc
 include $(PROGRAM_H)
 
 # The apt-cdrom program
 PROGRAM=apt-cdrom
 SLIBS = -lapt-pkg

+LIB_MAKES = apt-pkg/makefile

 SOURCE = apt-cdrom.cc
 include $(PROGRAM_H)
 SOURCE = apt-cdrom.cc
 include $(PROGRAM_H)

diff --git a/methods/makefile b/methods/makefile
index 00fec2bc8ad1e7a736189894e0315248fb33a518..dc6b88780d51301cc208f7554c6b41732b425cf8 100644 (file)
--- a/methods/makefile
+++ b/methods/makefile
@@ -9,35 +9,41 @@ BIN := $(BIN)/methods
 # The file method
 PROGRAM=file
 SLIBS = -lapt-pkg 
 # The file method
 PROGRAM=file
 SLIBS = -lapt-pkg 

+LIB_MAKES = apt-pkg/makefile

 SOURCE = file.cc
 include $(PROGRAM_H)
 
 # The copy method
 PROGRAM=copy
 SLIBS = -lapt-pkg 
 SOURCE = file.cc
 include $(PROGRAM_H)
 
 # The copy method
 PROGRAM=copy
 SLIBS = -lapt-pkg 

+LIB_MAKES = apt-pkg/makefile

 SOURCE = copy.cc
 include $(PROGRAM_H)
 
 # The gzip method
 PROGRAM=gzip
 SLIBS = -lapt-pkg 
 SOURCE = copy.cc
 include $(PROGRAM_H)
 
 # The gzip method
 PROGRAM=gzip
 SLIBS = -lapt-pkg 

+LIB_MAKES = apt-pkg/makefile

 SOURCE = gzip.cc
 include $(PROGRAM_H)
 
 # The cdrom method
 PROGRAM=cdrom
 SLIBS = -lapt-pkg 
 SOURCE = gzip.cc
 include $(PROGRAM_H)
 
 # The cdrom method
 PROGRAM=cdrom
 SLIBS = -lapt-pkg 

+LIB_MAKES = apt-pkg/makefile

 SOURCE = cdrom.cc
 include $(PROGRAM_H)
 
 # The http method
 PROGRAM=http
 SLIBS = -lapt-pkg 
 SOURCE = cdrom.cc
 include $(PROGRAM_H)
 
 # The http method
 PROGRAM=http
 SLIBS = -lapt-pkg 

+LIB_MAKES = apt-pkg/makefile

 SOURCE = http.cc
 include $(PROGRAM_H)
 
 # The ftp method
 PROGRAM=ftp
 SLIBS = -lapt-pkg 
 SOURCE = http.cc
 include $(PROGRAM_H)
 
 # The ftp method
 PROGRAM=ftp
 SLIBS = -lapt-pkg 

+LIB_MAKES = apt-pkg/makefile

 SOURCE = ftp.cc
 include $(PROGRAM_H)
 SOURCE = ftp.cc
 include $(PROGRAM_H)

diff --git a/test/makefile b/test/makefile
index eae6230d01222c0a825cb67d45a2e83228a085cf..49a501d3dea3a9cc144d83928382fd8055bab349 100644 (file)
--- a/test/makefile
+++ b/test/makefile
@@ -14,17 +14,20 @@ include $(PROGRAM_H)
 # Scratch program to test incomplete code fragments in
 PROGRAM=scratch-test
 SLIBS = -lapt-pkg 
 # Scratch program to test incomplete code fragments in
 PROGRAM=scratch-test
 SLIBS = -lapt-pkg 

+LIB_MAKES = apt-pkg/makefile

 SOURCE = scratch.cc
 include $(PROGRAM_H)
 
 # Version compare tester
 PROGRAM=versiontest
 SLIBS = -lapt-pkg 
 SOURCE = scratch.cc
 include $(PROGRAM_H)
 
 # Version compare tester
 PROGRAM=versiontest
 SLIBS = -lapt-pkg 

+LIB_MAKES = apt-pkg/makefile

 SOURCE = versiontest.cc
 include $(PROGRAM_H)
 
 # Version compare tester
 PROGRAM=srcrfind
 SLIBS = -lapt-pkg 
 SOURCE = versiontest.cc
 include $(PROGRAM_H)
 
 # Version compare tester
 PROGRAM=srcrfind
 SLIBS = -lapt-pkg 

+LIB_MAKES = apt-pkg/makefile

 SOURCE = srcrfind.cc
 include $(PROGRAM_H)
 SOURCE = srcrfind.cc
 include $(PROGRAM_H)