summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2010-10-21 02:21:37 +0000
committerBenny Prijono <bennylp@teluu.com>2010-10-21 02:21:37 +0000
commit3fde079dd8b4ab7b422a441973faca783051b564 (patch)
treee337527f415ccdea880c5a98f6429b5a209a21bd /Makefile
parenta1a71402dc2e0ac10748fef9756515acf47f29d4 (diff)
Misc (re #1134): added the ability to add python module build with the top level build, by adding pjsip-apps/src/python into EXTRA_DIRS in user.mak. Also changed the make command in python module to just build the module without installing since installing needs root permission
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3351 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f163403a..51459931 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
include build.mak
include build/host-$(HOST_NAME).mak
+-include user.mak
-DIRS = pjlib pjlib-util pjnath third_party pjmedia pjsip pjsip-apps
+DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build pjsip-apps/build $(EXTRA_DIRS)
ifdef MINSIZE
MAKE_FLAGS := MINSIZE=1
@@ -9,7 +10,7 @@ endif
all clean dep depend distclean print realclean:
for dir in $(DIRS); do \
- if $(MAKE) $(MAKE_FLAGS) -C $$dir/build $@; then \
+ if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \
true; \
else \
exit 1; \