diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-04-09 17:13:10 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-04-09 17:13:10 +0000 |
| commit | 032f5c4def19123a1c52d54691579dd6167543b9 (patch) | |
| tree | f1e07e9da3da02ba832e8e4b3fb846d1dcb3733c /build | |
| parent | 174c05e4ea8add3a5536d8818f3f78ddf7842d15 (diff) | |
Initial Makefiles for the third_party components
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/split-3rd-party@1180 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.mak | 12 | ||||
| -rw-r--r-- | build/rules.mak | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/build/common.mak b/build/common.mak index 3d84338b..d6000078 100644 --- a/build/common.mak +++ b/build/common.mak @@ -2,12 +2,12 @@ # Include host/target/compiler selection. # This will export CC_NAME, MACHINE_NAME, OS_NAME, and HOST_NAME variables. # -include ../../build.mak +include $(PJDIR)/build.mak # # Include global compiler specific definitions # -include ../../build/cc-$(CC_NAME).mak +include $(PJDIR)/build/cc-$(CC_NAME).mak # # (Optionally) Include compiler specific configuration that is @@ -19,13 +19,13 @@ include ../../build/cc-$(CC_NAME).mak # # Include global machine specific definitions # -include ../../build/m-$(MACHINE_NAME).mak +include $(PJDIR)/build/m-$(MACHINE_NAME).mak -include m-$(MACHINE_NAME).mak # # Include target OS specific definitions # -include ../../build/os-$(OS_NAME).mak +include $(PJDIR)/build/os-$(OS_NAME).mak # # (Optionally) Include target OS specific configuration that is @@ -37,7 +37,7 @@ include ../../build/os-$(OS_NAME).mak # # Include host specific definitions # -include ../../build/host-$(HOST_NAME).mak +include $(PJDIR)/build/host-$(HOST_NAME).mak # # (Optionally) Include host specific configuration that is @@ -49,6 +49,6 @@ include ../../build/host-$(HOST_NAME).mak # # Include global user configuration, if any # --include ../../user.mak +-include $(PJDIR)/user.mak diff --git a/build/rules.mak b/build/rules.mak index a77bc571..513ea6c2 100644 --- a/build/rules.mak +++ b/build/rules.mak @@ -1,5 +1,9 @@ +ifeq ($(LIBDIR),) LIBDIR = ../lib +endif +ifeq ($(BINDIR),) BINDIR = ../bin +endif # # The full path of output lib file (e.g. ../lib/libapp.a). @@ -71,7 +75,7 @@ print_lib: print_common @echo LIBDIR=$(LIBDIR) $(LIB): $(LIBDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) - $(AR)$(LIB) $(OBJS) + $(AR) $(LIB) $(OBJS) $(RANLIB) $(LIB) $(EXE): $(BINDIR) $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) |