Changeset 1055

Timestamp:

Mar 12, 2007 10:44:38 AM (17 years ago)

Author:

bennylp

Message:

Ticket #168: Added some variables in build.mak that can be used by application in its makefile

Location:

pjproject/trunk

Files:

• aconfigure (modified) (4 diffs)
• aconfigure.ac (modified) (2 diffs)
• build.mak.in (modified) (1 diff)

pjproject/trunk/aconfigure

@@ -309 +309 @@
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP ac_os_objs ac_pjmedia_snd ac_pa_cflags ac_pa_use_alsa ac_no_small_filter ac_no_large_filter ac_no_g711_plc ac_no_speex_aec ac_no_g711_codec ac_no_l16_codec ac_no_gsm_codec ac_no_speex_codec ac_no_ilbc_codec ac_no_ssl openssl_h_present libssl_present libcrypto_present ac_cross_compile ac_linux_poll ac_host ac_main_obj LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX ac_pjdir CPP EGREP ac_os_objs ac_pjmedia_snd ac_pa_cflags ac_pa_use_alsa ac_no_small_filter ac_no_large_filter ac_no_g711_plc ac_no_speex_aec ac_no_g711_codec ac_no_l16_codec ac_no_gsm_codec ac_no_speex_codec ac_no_ilbc_codec ac_no_ssl openssl_h_present libssl_present libcrypto_present ac_cross_compile ac_linux_poll ac_host ac_main_obj LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -1444 +1444 @@
 
 
+
 if test "$CFLAGS" = ""; then
   CFLAGS="-O2"
@@ -2743 +2744 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
+
+ac_pjdir=`pwd`
 
 
@@ -9774 +9778 @@
 s,@CXXFLAGS@,$CXXFLAGS,;t t
 s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+s,@ac_pjdir@,$ac_pjdir,;t t
 s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t

pjproject/trunk/aconfigure.ac

@@ -20 +20 @@
                 ])
 
+
 dnl
 dnl Setup default CFLAGS
@@ -34 +35 @@
 AC_PROG_CXX
 AC_LANG_C
+
+AC_SUBST(ac_pjdir)
+ac_pjdir=`pwd`
 
 AC_CHECK_LIB(pthread,pthread_create)

pjproject/trunk/build.mak.in

@@ -7 +7 @@
 export CROSS_COMPILE := @ac_cross_compile@
 export LINUX_POLL := @ac_linux_poll@ 
+
+# Application can use this
+export PJDIR := @ac_pjdir@
+export APP_CC := $(CROSS_COMPILE)$(CC_NAME)
+export APP_CFLAGS := -DPJ_AUTOCONF=1\
+        @CFLAGS@\
+        -I$(PJDIR)/pjlib/include\
+        -I$(PJDIR)/pjlib-util/include\
+        -I$(PJDIR)/pjmedia/include\
+        -I$(PJDIR)/pjsip/include
+export APP_CXXFLAGS := $(APP_CFLAGS)
+export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\
+        -L$(PJDIR)/pjlib-util/lib\
+        -L$(PJDIR)/pjmedia/lib\
+        -L$(PJDIR)/pjsip/lib\
+        @LDFLAGS@
+export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\
+        -lpjsip-ua-$(TARGET_NAME)\
+        -lpjsip-simple-$(TARGET_NAME)\
+        -lpjsip-$(TARGET_NAME)\
+        -lpjmedia-codec-$(TARGET_NAME)\
+        -lpjmedia-$(TARGET_NAME)\
+        -lpjmedia-codec-$(TARGET_NAME)\
+        -lpjlib-util-$(TARGET_NAME)\
+        -lpj-$(TARGET_NAME)\
+        @LIBS@
+