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 /pjnath | |
| parent | f3d98ed4613b4832ea37cbeacb0f710b72107fa1 (diff) | |
More fixes for dependencies, and to be more consistent.
Diffstat (limited to 'pjnath')
| -rw-r--r-- | pjnath/build/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile index 05c3342..e4b2077 100644 --- a/pjnath/build/Makefile +++ b/pjnath/build/Makefile @@ -17,13 +17,7 @@ PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT) export PJNATH_LIB:=libpjnath-$(TARGET_NAME)$(LIBEXT) ifeq ($(PJ_SHARED_LIBRARIES),) -PJNATH_LDLIB := -lpjnath-$(TARGET_NAME) -PJLIB_UTIL_LDLIB := -lpjlib-util-$(TARGET_NAME) -PJLIB_LDLIB := -lpj-$(TARGET_NAME) else -PJNATH_LDLIB := -lpjnath -PJLIB_UTIL_LDLIB := -lpjlib-util -PJLIB_LDLIB := -lpj export PJNATH_SONAME := libpjnath.$(SHLIB_SUFFIX) export PJNATH_SHLIB := $(PJNATH_SONAME).$(PJ_VERSION_MAJOR) endif @@ -48,6 +42,7 @@ export PJNATH_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ stun_msg.o stun_msg_dump.o stun_session.o stun_sock.o \ stun_transaction.o turn_session.o turn_sock.o export PJNATH_CFLAGS += $(_CFLAGS) +export PJNATH_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) ############################################################################### # Defines for building test application @@ -107,13 +102,12 @@ distclean: realclean .PHONY: all dep depend clean realclean distclean .PHONY: $(TARGETS) -.PHONY: $(PJNATH_LIB) $(PJNATH_SHLIB) $(PJNATH_SONAME) +.PHONY: $(PJNATH_LIB) $(PJNATH_SONAME) .PHONY: $(PJNATH_TEST_EXE) $(PJTURN_CLIENT_EXE) $(PJTURN_SRV_EXE) pjnath: $(PJNATH_LIB) -$(PJNATH_SHLIB): $(PJNATH_SONAME) $(PJNATH_SONAME): $(PJNATH_LIB) -$(PJNATH_LIB) $(PJNATH_SHLIB) $(PJNATH_SONAME): +$(PJNATH_LIB) $(PJNATH_SONAME): $(PJLIB_LIB) $(PJLIB_SONAME) $(PJLIB_UTIL_LIB) $(PJLIB_UTIL_SONAME) $(MAKE) -f $(RULES_MAK) APP=PJNATH app=pjnath $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) pjnath-test: $(PJNATH_TEST_EXE) |