Changeset 4656 for pjproject/trunk/build/rules.mak

Timestamp:

Nov 23, 2013 7:13:40 AM (10 years ago)

Author:

bennylp

Message:

Fixed #1713: Enable building the libraries as shared libraries/DLLs for GNU targets

File:

• pjproject/trunk/build/rules.mak (modified) (4 diffs)

pjproject/trunk/build/rules.mak

@@ -7 +7 @@
 
 #
-# The full path of output lib file (e.g. ../lib/libapp.a).
-#
-LIB = $($(APP)_LIB)
-
-#
-# The full path of output lib file (e.g. ../lib/libapp.a).
-#
+# The name(s) of output lib file(s) (e.g. libapp.a).
+#
+LIB := $($(APP)_LIB)
 SHLIB = $($(APP)_SHLIB)
-
-#
-# The full path of output executable file (e.g. ../bin/app.exe).
+SONAME = $($(APP)_SONAME)
+
+ifeq ($(SHLIB_SUFFIX),so)
+SHLIB_OPT := -shared -Wl,-soname,$(SHLIB)
+else ifeq ($(SHLIB_SUFFIX),dylib)
+SHLIB_OPT := -dynamiclib -undefined dynamic_lookup -flat_namespace
+else
+SHLIB_OPT := 
+endif
+
+#
+# The name of output executable file (e.g. app.exe).
 #
 EXE = $($(APP)_EXE)
@@ -77 +82 @@
 
 print_bin: print_common
-        @echo EXE=$(EXE)
+        @echo EXE=$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE))
         @echo BINDIR=$(BINDIR)
-
+ 
 print_lib: print_common
-        @echo LIB=$(LIB)
+ifneq ($(LIB),)
+        @echo LIB=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB))
+endif
+ifneq ($(SHLIB),)
+        @echo SHLIB=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB))
+endif
+ifneq ($(SONAME),)
+        @echo SONAME=$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME))
+endif
         @echo LIBDIR=$(LIBDIR)
 
-$(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+ifneq ($(LIB),)
+$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
         if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
-        $(AR) $(AR_FLAGS) $(LIB) $(OBJS)
-        $(RANLIB) $(LIB)
-
-$(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+        $(AR) $(AR_FLAGS) $@ $(OBJS)
+        $(RANLIB) $@
+endif
+
+ifneq ($(SHLIB),)
+$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
         if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
-        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(SHLIB)) \
+        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \
+            $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) $(SHLIB_OPT)
+endif
+ 
+ifneq ($(SONAME),)
+$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME)): $(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB))
+        ln -sf $(SHLIB) $@
+endif
+
+ifneq ($(EXE),)
+$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
+        if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi
+        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)) \
             $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS)
-
-$(EXE): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-        if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi
-        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \
-            $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS)
+endif
 
 $(OBJDIR)/$(app).o: $(OBJDIRS) $(OBJS)
@@ -148 +172 @@
 
 $(OBJDIRS):
-        $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR)) 
+        $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
 
 $(LIBDIR):
-        $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR))
+        $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
 
 $(BINDIR):
-        $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR))
+        $(subst @@,$(subst /,$(HOST_PSEP),$@),$(HOST_MKDIR))
 
 clean:
@@ -169 +193 @@
 
 realclean: clean
-        $(subst @@,$(subst /,$(HOST_PSEP),$(LIB)) $(subst /,$(HOST_PSEP),$(EXE)),$(HOST_RM))
+ifneq ($(LIB),)
+        $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)/$(LIB)),$(HOST_RM))
+endif
+ifneq ($(SHLIB),)
+        $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SHLIB)),$(HOST_RM))
+endif
+ifneq ($(SONAME),)
+        $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)/$(SONAME)),$(HOST_RM))
+endif
+ifneq ($(EXE),)
+        $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)/$(EXE)),$(HOST_RM))
+endif
         $(subst @@,$(DEP_FILE),$(HOST_RM))
 ifeq ($(OS_NAME),linux-kernel)