diff options
author | Jason Parker <jparker@digium.com> | 2013-02-15 12:54:17 -0600 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:24:47 -0500 |
commit | aa978eb3db4ea3b63566965a11730d5ff5da3500 (patch) | |
tree | 8a24e9a6859e5f12e64393ad5ab293d8fda8223b /pjlib | |
parent | f3d98ed4613b4832ea37cbeacb0f710b72107fa1 (diff) |
More fixes for dependencies, and to be more consistent.
Diffstat (limited to 'pjlib')
-rw-r--r-- | pjlib/build/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile index 926fea2..9b70994 100644 --- a/pjlib/build/Makefile +++ b/pjlib/build/Makefile @@ -10,9 +10,7 @@ RULES_MAK := $(PJDIR)/build/rules.mak export PJLIB_LIB := libpj-$(TARGET_NAME)$(LIBEXT) ifeq ($(PJ_SHARED_LIBRARIES),) -PJLIB_LDLIB := -lpj-$(TARGET_NAME) else -PJLIB_LDLIB := -lpj export PJLIB_SONAME := libpj.$(SHLIB_SUFFIX) export PJLIB_SHLIB := $(PJLIB_SONAME).$(PJ_VERSION_MAJOR) endif @@ -40,6 +38,7 @@ export PJLIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ ssl_sock_common.o ssl_sock_ossl.o ssl_sock_dump.o \ string.o timer.o types.o export PJLIB_CFLAGS += $(_CFLAGS) +export PJLIB_LDFLAGS += $(_LDFLAGS) ############################################################################### # Defines for building test application @@ -89,7 +88,7 @@ depend: ../include/pj/config_site.h .PHONY: all dep depend clean realclean distclean .PHONY: $(TARGETS) -.PHONY: $(PJLIB_LIB) $(PJLIB_SHLIB) $(PJLIB_SONAME) +.PHONY: $(PJLIB_LIB) $(PJLIB_SONAME) .PHONY: $(TEST_EXE) dep: depend @@ -97,9 +96,8 @@ dep: depend pjlib: $(PJLIB_LIB) $(PJLIB_LIB): ../include/pj/config_site.h -$(PJLIB_SHLIB): $(PJLIB_SONAME) $(PJLIB_SONAME): $(PJLIB_LIB) -$(PJLIB_LIB) $(PJLIB_SHLIB) $(PJLIB_SONAME): +$(PJLIB_LIB) $(PJLIB_SONAME): $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) ../include/pj/config_site.h: |