Fixed configure

[apt.git] / buildlib / program.mak

diff --git a/buildlib/program.mak b/buildlib/program.mak
index 8bca3c24ea8691cbde0d27be72d66de126eed6fc..fe0d30de3f855813851fe70d54a5613326d8b434 100644 (file)
--- a/buildlib/program.mak
+++ b/buildlib/program.mak
@@ -6,15 +6,18 @@
 # $(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
 
 # Some local definitions
 LOCAL := $(PROGRAM)
 $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .o,$(notdir $(basename $(SOURCE)))))
 
 # See defaults.mak for information about LOCAL
 
 # Some local definitions
 LOCAL := $(PROGRAM)
 $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .o,$(notdir $(basename $(SOURCE)))))

-$(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .d,$(notdir $(basename $(SOURCE)))))
+$(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .o.d,$(notdir $(basename $(SOURCE)))))

 $(LOCAL)-BIN := $(BIN)/$(PROGRAM)
 $(LOCAL)-SLIBS := $(SLIBS)
 $(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,9 +32,9 @@ 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 $@
        echo Building program $@

-       $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(LOCAL)-SLIBS)
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)

 
 # Compilation rules
 vpath %.cc $(SUBDIRS)
 
 # Compilation rules
 vpath %.cc $(SUBDIRS)