Ignore:
Timestamp:
Jan 15, 2010 3:06:20 PM (12 years ago)
Author:
bennylp
Message:

Ticket #694: work on 'make install':

  • adhere to --prefix
  • header and lib files installation
  • pkgconfig creation
  • also added version.mak to fill in with the correct version
File:
1 edited

Legend:

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

    r3062 r3063  
    88export LINUX_POLL := @ac_linux_poll@  
    99 
     10export ac_prefix := @prefix@ 
     11 
    1012LIB_SUFFIX = $(TARGET_NAME).a 
    1113 
    1214# Determine which party libraries to use 
    1315export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME) 
     16export APP_THIRD_PARTY_EXT := 
    1417export 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) 
    1518 
     
    1720ifeq (@ac_external_gsm@,1) 
    1821# External GSM library 
    19 APP_THIRD_PARTY_LIBS += -lgsm 
    20 APP_THIRD_PARTY_LIB_FILES += 
     22APP_THIRD_PARTY_EXT += -lgsm 
    2123else 
    2224APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME) 
     
    2729ifneq (@ac_no_speex_codec@,1) 
    2830ifeq (@ac_external_speex@,1) 
    29 APP_THIRD_PARTY_LIBS += -lspeex -lspeexdsp 
    30 APP_THIRD_PARTY_LIB_FILES += 
     31APP_THIRD_PARTY_EXT += -lspeex -lspeexdsp 
    3132else 
    3233APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME) 
     
    4748ifneq ($(findstring pa,@ac_pjmedia_snd@),) 
    4849ifeq (@ac_external_pa@,1) 
    49 APP_THIRD_PARTY_LIBS += -lportaudio 
    50 APP_THIRD_PARTY_LIB_FILES +=  
     50# External PA 
     51APP_THIRD_PARTY_EXT += -lportaudio 
    5152else 
    5253APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME) 
     
    8687        -lpjlib-util-$(TARGET_NAME)\ 
    8788        $(APP_THIRD_PARTY_LIBS)\ 
     89        $(APP_THIRD_PARTY_EXT)\ 
    8890        -lpj-$(TARGET_NAME)\ 
    8991        @LIBS@ 
     
    100102        $(PJ_DIR)/pjlib/lib/libpj-$(LIB_SUFFIX) 
    101103 
     104# Here are the variabels to use if application is using the library 
     105# from within the source distribution 
    102106export PJ_DIR := $(PJDIR) 
    103107export PJ_CC := $(APP_CC) 
     
    108112export PJ_LIB_FILES := $(APP_LIB_FILES) 
    109113 
     114# And here are the variables to use if application is using the 
     115# library from the install location (i.e. --prefix) 
     116export PJ_INSTALL_DIR := @prefix@ 
     117export PJ_INSTALL_INC_DIR := $(PJ_INSTALL_DIR)/include 
     118export PJ_INSTALL_LIB_DIR := $(PJ_INSTALL_DIR)/lib 
     119export PJ_INSTALL_CFLAGS := -I$(PJ_INSTALL_INC_DIR) -DPJ_AUTOCONF=1     @CFLAGS@ 
     120export PJ_INSTALL_CXXFLAGS := $(PJ_INSTALL_CFLAGS) 
     121export PJ_INSTALL_LDFLAGS := -L$(PJ_INSTALL_LIB_DIR) $(APP_LDLIBS) 
Note: See TracChangeset for help on using the changeset viewer.