move pkgSourceList::AddMetaIndex() into a private subclass until we decide about...

[apt.git] / buildlib / staticlibrary.mak

diff --git a/buildlib/staticlibrary.mak b/buildlib/staticlibrary.mak
index 998ca5bf2e57f3cb8e488ffec6c9e9318324c554..86908700ffbfda6f51baea9c415ff0c65669a627 100644 (file)
--- a/buildlib/staticlibrary.mak
+++ b/buildlib/staticlibrary.mak
@@ -24,6 +24,9 @@ library: $($(LOCAL)-LIB)
 clean: clean/$(LOCAL)
 veryclean: veryclean/$(LOCAL)
 
 clean: clean/$(LOCAL)
 veryclean: veryclean/$(LOCAL)
 

+# Make Directories
+MKDIRS += $(OBJ) $(DEP) $(LIB) $(dir $($(LOCAL)-HEADERS))
+

 # The clean rules
 .PHONY: clean/$(LOCAL) veryclean/$(LOCAL)
 clean/$(LOCAL):
 # The clean rules
 .PHONY: clean/$(LOCAL) veryclean/$(LOCAL)
 clean/$(LOCAL):


@@ -39,12 +42,15 @@ $($(LOCAL)-LIB): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
        echo Building library $@
        -rm $@ > /dev/null 2>&1
        $(AR) cq $@ $(filter %.o,$^)
        echo Building library $@
        -rm $@ > /dev/null 2>&1
        $(AR) cq $@ $(filter %.o,$^)

+ifneq ($(words $(RANLIB)),0)
+       $(RANLIB) $@
+endif

 
 # Compilation rules
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
        echo Compiling $< to $@
 
 # Compilation rules
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
        echo Compiling $< to $@

-       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(abspath $<)

        $(DoDep)
 
 # Include the dependencies that are available
        $(DoDep)
 
 # Include the dependencies that are available