From 9022193c7ebedb566d81939cff558d94ba706de5 Mon Sep 17 00:00:00 2001
From: Benny Prijono <bennylp@teluu.com>
Date: Wed, 8 Feb 2006 11:16:34 +0000
Subject: Fixed root Makefile for make size

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@157 74dad513-b988-da41-8d7b-12977e46ad98
---
 Makefile | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 69733c62..975076dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+include build.mak
+include build/host-$(HOST_NAME).mak
+
 DIRS = pjlib pjlib-util pjmedia pjsip
 
 ifdef MINSIZE
@@ -15,9 +18,12 @@ all clean dep depend distclean doc print realclean:
 	   fi \
 	done
 
-LIBS = pjlib/lib/libpj.a pjsdp/lib/libpjsdp.a pjmedia/lib/libpjmedia.a \
-       pjsip/lib/libpjsip_core.a pjsip/lib/libpjsip_ua.a
-BINS = pjsip/bin/pjsua$(EXE) 
+LIBS = 	pjlib/lib/libpj-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
+	pjlib-util/lib/libpjlib-util-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
+	pjmedia/lib/libpjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
+       	pjsip/lib/libpjsip-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
+	pjsip/lib/libpjsip-ua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a
+BINS = 	pjsip/bin/pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE) 
 
 size:
 	@echo -n 'Date: '
@@ -36,12 +42,12 @@ size:
 		size $$bin; \
 	done
 
-dos2unix:
-	for f in `find . | egrep '(mak|h|c|S|s|Makefile)$$'`; do \
-		dos2unix "$$f" > dos2unix.tmp; \
-		cp dos2unix.tmp "$$f"; \
-	done
-	rm -f dos2unix.tmp
+#dos2unix:
+#	for f in `find . | egrep '(mak|h|c|S|s|Makefile)$$'`; do \
+#		dos2unix "$$f" > dos2unix.tmp; \
+#		cp dos2unix.tmp "$$f"; \
+#	done
+#	rm -f dos2unix.tmp
 
 xhdrid:
 	for f in `find . | egrep '\.(h|c|S|s|cpp|hpp)$$'`; do \
-- 
cgit v1.2.3