Changeset 2183


Ignore:
Timestamp:
Jul 29, 2008 11:42:20 AM (11 years ago)
Author:
bennylp
Message:

Fixed ticket #581: Fixed build dependencies in the makefiles

Location:
pjproject/trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/build.mak.in

    r1735 r2183  
    88export LINUX_POLL := @ac_linux_poll@  
    99 
     10LIB_SUFFIX = $(TARGET_NAME).a 
     11 
    1012# Determine which party libraries to use 
    1113export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME) 
     14export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX) 
    1215 
    1316ifneq (@ac_no_gsm_codec@,1) 
    1417APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME) 
     18APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX) 
    1519endif 
    1620 
    1721ifneq (@ac_no_speex_codec@,1) 
    1822APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME) 
     23APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX) 
    1924endif 
    2025 
    2126ifneq (@ac_no_ilbc_codec@,1) 
    2227APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME) 
     28APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX) 
    2329endif 
    2430 
    2531ifneq ($(findstring pa,@ac_pjmedia_snd@),) 
    2632APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME) 
     33APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX) 
    2734endif 
    2835 
     
    5764        -lpj-$(TARGET_NAME)\ 
    5865        @LIBS@ 
     66export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-$(LIB_SUFFIX) \ 
     67        $(PJ_DIR)/pjsip/lib/libpjsip-ua-$(LIB_SUFFIX) \ 
     68        $(PJ_DIR)/pjsip/lib/libpjsip-simple-$(LIB_SUFFIX) \ 
     69        $(PJ_DIR)/pjsip/lib/libpjsip-$(LIB_SUFFIX) \ 
     70        $(PJ_DIR)/pjmedia/lib/libpjmedia-codec-$(LIB_SUFFIX) \ 
     71        $(PJ_DIR)/pjmedia/lib/libpjmedia-$(LIB_SUFFIX) \ 
     72        $(PJ_DIR)/pjnath/lib/libpjnath-$(LIB_SUFFIX) \ 
     73        $(PJ_DIR)/pjlib-util/lib/libpjlib-util-$(LIB_SUFFIX) \ 
     74        $(APP_THIRD_PARTY_LIB_FILES) \ 
     75        $(PJ_DIR)/pjlib/lib/libpj-$(LIB_SUFFIX) 
    5976 
    6077export PJ_DIR := $(PJDIR) 
     
    6481export PJ_LDFLAGS := $(APP_LDFLAGS) 
    6582export PJ_LDLIBS := $(APP_LDLIBS) 
     83export PJ_LIB_FILES := $(APP_LIB_FILES) 
    6684 
  • pjproject/trunk/build/rules.mak

    r1180 r2183  
    7575        @echo LIBDIR=$(LIBDIR) 
    7676 
    77 $(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 
     77$(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 
     78        if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi 
    7879        $(AR) $(LIB) $(OBJS) 
    7980        $(RANLIB) $(LIB) 
    8081 
    81 $(EXE): $(BINDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 
     82$(EXE): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) 
     83        if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi 
    8284        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \ 
    8385            $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) 
  • pjproject/trunk/pjlib-util/build/Makefile

    r2037 r2183  
    6969        $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $(PJLIB_UTIL_LIB) 
    7070 
    71 pjlib-util-test: $(PJLIB_LIB) 
     71pjlib-util-test: 
    7272        $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $(UTIL_TEST_EXE) 
    7373 
     
    9494        $(MAKE) -f $(RULES_MAK) APP=PJLIB_UTIL app=pjlib-util $@ 
    9595        $(MAKE) -f $(RULES_MAK) APP=UTIL_TEST app=pjlib-util-test $@ 
    96         echo '$(TEST_EXE): $(PJLIB_UTIL_LIB)' >> .pjlib-util-test-$(TARGET_NAME).depend; \ 
     96        echo '$(UTIL_TEST_EXE): $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjlib-util-test-$(TARGET_NAME).depend; \ 
    9797 
    9898 
  • pjproject/trunk/pjmedia/build/Makefile

    r2107 r2183  
    172172        $(MAKE) -f $(RULES_MAK) APP=PJMEDIA_TEST app=pjmedia-test $@ 
    173173        $(MAKE) -f $(RULES_MAK) APP=PJSDP app=pjsdp $@ 
    174         echo '$(PJMEDIA_LIB): .pjmedia-$(TARGET_NAME).depend' >> .pjmedia-$(TARGET_NAME).depend; \ 
    175         echo '$(PJMEDIA_CODEC_LIB): .pjmedia-codec-$(TARGET_NAME).depend' >> .pjmedia-codec-$(TARGET_NAME).depend; \ 
    176         echo '$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB)' >> .pjmedia-test-$(TARGET_NAME).depend; \ 
     174        echo '$(PJMEDIA_TEST_EXE): $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjmedia-test-$(TARGET_NAME).depend 
    177175 
    178176 
  • pjproject/trunk/pjnath/build/Makefile

    r2037 r2183  
    132132        $(MAKE) -f $(RULES_MAK) APP=PJTURN_CLIENT app=pjturn-client $@ 
    133133        $(MAKE) -f $(RULES_MAK) APP=PJTURN_SRV app=pjturn-srv $@ 
    134         echo '$(TEST_EXE): $(PJNATH_LIB)' >> .pjnath-test-$(TARGET_NAME).depend; \ 
     134        echo '$(PJNATH_TEST_EXE): $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjnath-test-$(TARGET_NAME).depend 
     135        echo '$(PJTURN_CLIENT_EXE): $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjturn-client-$(TARGET_NAME).depend 
     136        echo '$(PJTURN_SRV_EXE): $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjturn-srv-$(TARGET_NAME).depend 
    135137 
    136138 
  • pjproject/trunk/pjsip-apps/build/Makefile

    r2182 r2183  
    7171        $(MAKE) -f Samples.mak $@ 
    7272        @if test "$@" = "depend"; then \ 
    73           echo '$(PJSUA_EXE): $(PJSIP_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE) $(PJSUA_LIB_LIB) $(PJLIB_LIB) $(PJLIB_UTIL_LIB) $(PJNATH_LIB) $(PJMEDIA_LIB) $(PJMEDIA_CODEC_LIB) Makefile' >> .pjsua-$(TARGET_NAME).depend; \ 
     73          echo '$(PJSUA_EXE): $(APP_LIB_FILES)' >> .pjsua-$(TARGET_NAME).depend; \ 
    7474        fi 
    7575 
  • pjproject/trunk/pjsip-apps/build/Samples.mak

    r2178 r2183  
    4242all: $(OBJDIR) $(EXES) 
    4343 
    44 $(BINDIR)/%-$(TARGET_NAME)$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(LIBS) 
     44$(BINDIR)/%-$(TARGET_NAME)$(HOST_EXE): $(OBJDIR)/%$(OBJEXT) $(PJ_LIB_FILES) 
    4545        $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$@) \ 
    4646            $(subst /,$(HOST_PSEP),$<) \ 
  • pjproject/trunk/pjsip/build/Makefile

    r2037 r2183  
    156156        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 
    157157 
    158 clean depend: 
     158clean: 
    159159        $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@ 
    160160        $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@ 
     
    162162        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 
    163163        $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ 
     164 
     165depend: 
     166        $(MAKE) -f $(RULES_MAK) APP=PJSIP app=pjsip $@ 
     167        $(MAKE) -f $(RULES_MAK) APP=PJSIP_UA app=pjsip-ua $@ 
     168        $(MAKE) -f $(RULES_MAK) APP=PJSIP_SIMPLE app=pjsip-simple $@ 
     169        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $@ 
     170        $(MAKE) -f $(RULES_MAK) APP=TEST app=pjsip-test $@ 
     171        echo '$(TEST_EXE): $(PJMEDIA_LIB) $(PJSUA_LIB_LIB) $(PJSIP_SIMPLE_LIB) $(PJSIP_UA_LIB) $(PJSIP_LIB) $(PJNATH_LIB) $(PJLIB_UTIL_LIB) $(PJLIB_LIB)' >> .pjsip-test-$(TARGET_NAME).depend 
    164172 
    165173realclean: 
  • pjproject/trunk/third_party/build/gsm/Makefile

    r1180 r2183  
    6161depend: 
    6262        $(MAKE) -f $(RULES_MAK) APP=GSM_CODEC app=libgsmcodec $@ 
    63         echo '$(GSM_CODEC_LIB): .libgsmcodec-$(TARGET_NAME).depend' >> .libgsmcodec-$(TARGET_NAME).depend; \ 
    6463 
    6564 
  • pjproject/trunk/third_party/build/ilbc/Makefile

    r1180 r2183  
    6262depend: 
    6363        $(MAKE) -f $(RULES_MAK) APP=ILBC app=libilbccodec $@ 
    64         echo '$(ILBC_LIB): .libilbccodec-$(TARGET_NAME).depend' >> .libilbccodec-$(TARGET_NAME).depend; \ 
    6564 
    6665 
  • pjproject/trunk/third_party/build/milenage/Makefile

    r1488 r2183  
    5555depend: 
    5656        $(MAKE) -f $(RULES_MAK) APP=MILENAGE app=libmilenage $@ 
    57         echo '$(MILENAGE_LIB): .libmilenage-$(TARGET_NAME).depend' >> .libmilenage-$(TARGET_NAME).depend; \ 
    5857 
    5958 
  • pjproject/trunk/third_party/build/portaudio/Makefile

    r1202 r2183  
    6666depend: 
    6767        $(MAKE) -f $(RULES_MAK) APP=PORTAUDIO app=libportaudio $@ 
    68         echo '$(PORTAUDIO_LIB): .libportaudio-$(TARGET_NAME).depend' >> .libportaudio-$(TARGET_NAME).depend; \ 
    6968 
  • pjproject/trunk/third_party/build/resample/Makefile

    r1180 r2183  
    5555depend: 
    5656        $(MAKE) -f $(RULES_MAK) APP=RESAMPLE app=libresample $@ 
    57         echo '$(RESAMPLE_LIB): .libresample-$(TARGET_NAME).depend' >> .libresample-$(TARGET_NAME).depend; \ 
    5857 
    5958 
  • pjproject/trunk/third_party/build/speex/Makefile

    r2002 r2183  
    7070depend: 
    7171        $(MAKE) -f $(RULES_MAK) APP=SPEEX app=libspeex $@ 
    72         echo '$(SPEEX_LIB): .libspeex-$(TARGET_NAME).depend' >> .libspeex-$(TARGET_NAME).depend; \ 
    7372 
    7473 
  • pjproject/trunk/third_party/build/srtp/Makefile

    r1782 r2183  
    8383depend: 
    8484        $(MAKE) -f $(RULES_MAK) APP=SRTP app=libsrtp $@ 
    85         echo '$(SRTP_LIB): .libsrtp-$(TARGET_NAME).depend' >> .libsrtp-$(TARGET_NAME).depend; \ 
    8685 
    8786 
Note: See TracChangeset for help on using the changeset viewer.