From: Tinku Mannan <tmannan@ti.com>
Date: Tue, 29 Apr 2014 13:35:28 +0000 (-0400)
Subject: HPLIB makefile updates to sync with yocto recipes
X-Git-Tag: DEV.NETAPI.01.01.00.08~24
X-Git-Url: https://git.ti.com/gitweb?p=keystone-rtos%2Fnetapi.git;a=commitdiff_plain;h=b92b35d315b328e26b5296925ace665f3ea31865

HPLIB makefile updates to sync with yocto recipes
---

diff --git a/ti/runtime/hplib/build/Makefile b/ti/runtime/hplib/build/Makefile
index d78182b..dd238de 100755
--- a/ti/runtime/hplib/build/Makefile
+++ b/ti/runtime/hplib/build/Makefile
@@ -86,12 +86,12 @@ $(COMMONSRCCOBJS_SO): $(ARMV7OBJDIR_SO)/%.$(OBJEXT): %.c $(ARMV7OBJDIR_SO)/.crea
 	-@echo compiling $< ...
 	$(CC) -c $(CFLAGS) $(INTERNALDEFS) -fPIC $(INCS) $< -o $@
 
-$(ARMV7LIBDIR)/libhplib.a: $(COMMONSRCCOBJS) $(ARMV7LIBDIR)/.created
+$(ARMV7LIBDIR)/libhplib_$(DEVICE).a: $(COMMONSRCCOBJS) $(ARMV7LIBDIR)/.created
 	@mkdir -p $(ARMV7LIBDIR)
 	@echo archiving $? into $@ ...
 	@$(AR) -r $@ $?
 
-libhplib.so: $(COMMONSRCCOBJS_SO)
+libhplib_$(DEVICE).so: $(COMMONSRCCOBJS_SO)
 	@echo archiving $? into $(ARMV7LIBDIR)/$@.1 ...
 	@$(CC) $(DEBUG_FLAG) -ggdb2 -Wl,-soname=$@.1 -shared -fPIC ${LDFLAGS} -o $@.1.0.0 $^
 	@ln -s $@.1.0.0 $@.1
@@ -128,12 +128,12 @@ $(COMMONSRCCOBJS1_SO): $(ARMV7OBJDIR_NO_OSAL_SO)/%.$(OBJEXT): %.c $(ARMV7OBJDIR_
 
 
 
-$(ARMV7LIBDIR)/libhplib-no-osal.a: $(COMMONSRCCOBJS1) $(ARMV7LIBDIR)/.created
+$(ARMV7LIBDIR)/libhplib-no-osal_$(DEVICE).a: $(COMMONSRCCOBJS1) $(ARMV7LIBDIR)/.created
 	@mkdir -p $(ARMV7LIBDIR)
 	@echo archiving $? into $@ ...
 	@$(AR) -r $@ $?
 
-libhplib-no-osal.so: $(COMMONSRCCOBJS1_SO)
+libhplib-no-osal_$(DEVICE).so: $(COMMONSRCCOBJS1_SO)
 	@echo archiving $? into $(ARMV7LIBDIR)/$@.1 ...
 	@$(CC) $(DEBUG_FLAG) -ggdb2 -Wl,-soname=$@.1 -shared -fPIC ${LDFLAGS} -o $@.1.0.0 $^
 	@ln -s $@.1.0.0 $@.1
@@ -155,7 +155,7 @@ clean:
 	rm -rf $(ARMV7OBJDIR_SO)
 	rm -rf $(ARMV7OBJDIR_NO_OSAL)
 	rm -rf $(ARMV7OBJDIR_NO_OSAL_SO)
-	rm -f $(ARMV7LIBDIR)/libhplib*.*
+	rm -f $(ARMV7LIBDIR)/libhplib_$(DEVICE).*
 
 module:
 	-@echo compiling $< ...
diff --git a/ti/runtime/hplib/makefile_armv7 b/ti/runtime/hplib/makefile_armv7
index 8b3f0d2..4a795f0 100755
--- a/ti/runtime/hplib/makefile_armv7
+++ b/ti/runtime/hplib/makefile_armv7
@@ -14,7 +14,7 @@
 
 # Output for prebuilt generated libraries
 
-export DEVICE ?=k2h
+export DEVICE ?=k2l
 export ARMV7LIBDIR ?= ./lib
 export ARMV7OBJDIR ?= ./obj/$(DEVICE)
 export ARMV7BINDIR ?= ./bin/$(DEVICE)
@@ -65,25 +65,25 @@ all: .executables install installbin
 lib: .libraries
 
 # Make rule to create $(ARMV7LIBDIR)/hplib.a library
-.libraries: $(ARMV7LIBDIR)/libhplib.a libhplib.so $(ARMV7LIBDIR)/libhplib-no-osal.a libhplib-no-osal.so
+.libraries: $(ARMV7LIBDIR)/libhplib_$(DEVICE).a libhplib_$(DEVICE).so $(ARMV7LIBDIR)/libhplib-no-osal_$(DEVICE).a libhplib-no-osal_$(DEVICE).so
 
 hplib: $(ARMV7LIBDIR)/libhplib.a libhplib.so
 
 hplib-no-osal: $(ARMV7LIBDIR)/libhplib-no-osal.a libhplib-no-osal.so
 
-$(ARMV7LIBDIR)/libhplib.a:
+$(ARMV7LIBDIR)/libhplib_$(DEVICE).a:
 	-@echo Calling make lib with $@
 	@$(MAKE) -f ./build/Makefile $@
 
-libhplib.so:
+libhplib_$(DEVICE).so:
 	-@echo Calling make lib with $@
 	@$(MAKE) -f ./build/Makefile $@
 
-$(ARMV7LIBDIR)/libhplib-no-osal.a:
+$(ARMV7LIBDIR)/libhplib-no-osal_$(DEVICE).a:
 	-@echo Calling make lib with $@
 	@$(MAKE) -f ./build/Makefile $@
 
-libhplib-no-osal.so:
+libhplib-no-osal_$(DEVICE).so:
 	-@echo Calling make lib with $@
 	@$(MAKE) -f ./build/Makefile $@
 
@@ -103,16 +103,17 @@ install:
 	install -d $(INSTALL_LIB_BASE_DIR)
 	$(CP) ./*.h                $(INSTALL_INC_BASE_DIR)/ti/runtime/hplib
 	$(CP) -r ./device $(INSTALL_INC_BASE_DIR)/ti/runtime/hplib/
-	@$(CP) -r $(ARMV7LIBDIR)/libhplib.a             $(INSTALL_LIB_BASE_DIR)
-	@$(CP) -rp $(ARMV7LIBDIR)/libhplib.so*          $(INSTALL_LIB_BASE_DIR)
-	@$(CP) -r $(ARMV7LIBDIR)/libhplib-no-osal.a     $(INSTALL_LIB_BASE_DIR)
-	@$(CP) -rp $(ARMV7LIBDIR)/libhplib-no-osal.so*  $(INSTALL_LIB_BASE_DIR)
+	@$(CP) -r $(ARMV7LIBDIR)/libhplib_$(DEVICE).a             $(INSTALL_LIB_BASE_DIR)
+	@$(CP) -rp $(ARMV7LIBDIR)/libhplib_$(DEVICE).so*          $(INSTALL_LIB_BASE_DIR)
+	@$(CP) -r $(ARMV7LIBDIR)/libhplib-no-osal_$(DEVICE).a     $(INSTALL_LIB_BASE_DIR)
+	@$(CP) -rp $(ARMV7LIBDIR)/libhplib-no-osal_$(DEVICE).so*  $(INSTALL_LIB_BASE_DIR)
 	$(CP) src/*.h                $(INSTALL_INC_BASE_DIR)/ti/runtime/hplib/src
 
 installbin:
 	install -d $(INSTALL_BIN_BASE_DIR)
 	install -c -m 755 $(ARMV7BINDIR)/hplib/test/hplibmod_test $(INSTALL_BIN_BASE_DIR)/hplibmod_test_$(DEVICE)
 	install -c -m 755 $(ARMV7BINDIR)/hplib/test/pmutest $(INSTALL_BIN_BASE_DIR)/pmutest_$(DEVICE)
+
 # Make rule to create tests
 
 tests:
diff --git a/ti/runtime/hplib/test/build/Makefile b/ti/runtime/hplib/test/build/Makefile
index d37410c..64cc589 100755
--- a/ti/runtime/hplib/test/build/Makefile
+++ b/ti/runtime/hplib/test/build/Makefile
@@ -19,7 +19,7 @@ CPPI_INC_DIR = $(PDK_INSTALL_PATH)/ti/drv/cppi
 HPLIB_SRC_DIR ?= $(TRANS_SDK_INSTALL_PATH)/ti/runtime/hplib
 
 # Support Libraries used by HPLIB 
-HP_LIB = -lhplib
+HP_LIB = -lhplib_$(DEVICE)
 
 ifeq ($(USEDYNAMIC_LIB), yes)
 #presuming ARM executable would depend on dynamic library dependency