diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
| commit | 6b4964727bffb379aca9601e1cf69051ccbf600c (patch) | |
| tree | 1d9739ea8b3b5e0421f1d99b39e798b1514fb644 /build | |
| parent | 85ac546acb235df62169c4ad317da74a62e56a88 (diff) | |
Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3999 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build')
| -rw-r--r-- | build/rules.mak | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build/rules.mak b/build/rules.mak index 660ed931..0d35c56f 100644 --- a/build/rules.mak +++ b/build/rules.mak @@ -11,6 +11,11 @@ endif LIB = $($(APP)_LIB) # +# The full path of output lib file (e.g. ../lib/libapp.a). +# +SHLIB = $($(APP)_SHLIB) + +# # The full path of output executable file (e.g. ../bin/app.exe). # EXE = $($(APP)_EXE) @@ -82,6 +87,11 @@ $(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) $(AR) $(LIB) $(OBJS) $(RANLIB) $(LIB) +$(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)) \ + $(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)) \ |