merged from lp:~mvo/apt/mvo

[apt.git] / buildlib / library.mak

diff --git a/buildlib/library.mak b/buildlib/library.mak
index 229479fa2047f66a905821fe6b90e9745257daf4..029e8746319177124d6bb25ec3f6bac217dc51a4 100644 (file)
--- a/buildlib/library.mak
+++ b/buildlib/library.mak
@@ -5,9 +5,10 @@
 # Input
 # $(SOURCE) - The source code to use
 # $(HEADERS) - Exported header files and private header files
 # Input
 # $(SOURCE) - The source code to use
 # $(HEADERS) - Exported header files and private header files

-# $(LIBRARY) - The name of the library without lib or .so 
+# $(LIBRARY) - The name of the library without lib or .so

 # $(MAJOR) - The major version number of this library
 # $(MINOR) - The minor version number of this library
 # $(MAJOR) - The major version number of this library
 # $(MINOR) - The minor version number of this library

+# $(APT_DOMAIN) - The text domain for this library

 
 # All output is writtin to .opic files in the build directory to
 # signify the PIC output.
 
 # All output is writtin to .opic files in the build directory to
 # signify the PIC output.


@@ -23,6 +24,9 @@ $(LOCAL)-SONAME := lib$(LIBRARY).so.$(MAJOR)
 $(LOCAL)-SLIBS := $(SLIBS)
 $(LOCAL)-LIBRARY := $(LIBRARY)
 
 $(LOCAL)-SLIBS := $(SLIBS)
 $(LOCAL)-LIBRARY := $(LIBRARY)
 

+TYPE = src
+include $(PODOMAIN_H)
+

 # Install the command hooks
 headers: $($(LOCAL)-HEADERS)
 library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY).so.$(MAJOR)
 # Install the command hooks
 headers: $($(LOCAL)-HEADERS)
 library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY).so.$(MAJOR)


@@ -37,7 +41,7 @@ MKDIRS += $(OBJ) $(DEP) $(LIB) $(dir $($(LOCAL)-HEADERS))
 clean/$(LOCAL):
        -rm -f $($(@F)-OBJS) $($(@F)-DEP)
 veryclean/$(LOCAL): clean/$(LOCAL)
 clean/$(LOCAL):
        -rm -f $($(@F)-OBJS) $($(@F)-DEP)
 veryclean/$(LOCAL): clean/$(LOCAL)

-       -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY).so*
+       -rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.so*

 
 # Build rules for the two symlinks
 .PHONY: $(LIB)/lib$(LIBRARY).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so
 
 # Build rules for the two symlinks
 .PHONY: $(LIB)/lib$(LIBRARY).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so


@@ -45,10 +49,10 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR): $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
        ln -sf $(<F) $@
 $(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
        ln -sf $(<F) $@
        ln -sf $(<F) $@
 $(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
        ln -sf $(<F) $@

-       
+

 # The binary build rule
 $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
 # The binary build rule
 $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)

-       -rm -f $(LIB)/lib$($(@F)-LIBRARY).so* 2> /dev/null
+       -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null

        echo Building shared library $@
        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
           -o $@ $(SONAME_MAGIC)$($(@F)-SONAME) -shared \
        echo Building shared library $@
        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
           -o $@ $(SONAME_MAGIC)$($(@F)-SONAME) -shared \


@@ -66,4 +70,4 @@ $(OBJ)/%.opic: %.cc
 The_DFiles = $(wildcard $($(LOCAL)-DEP))
 ifneq ($(words $(The_DFiles)),0)
 include $(The_DFiles)
 The_DFiles = $(wildcard $($(LOCAL)-DEP))
 ifneq ($(words $(The_DFiles)),0)
 include $(The_DFiles)

-endif 
+endif