Makefile updates for install
authorTinku Mannan <tmannan@ti.com>
Fri, 8 Aug 2014 19:13:34 +0000 (15:13 -0400)
committerTinku Mannan <tmannan@ti.com>
Mon, 11 Aug 2014 14:36:25 +0000 (10:36 -0400)
ti/runtime/netapi/demo/build/Makefile
ti/runtime/netapi/demo/makefile_armv7 [new file with mode: 0755]
ti/runtime/netapi/makefile_armv7

index 7194cc4aadca58e66a48e129ab5338758f98bbcf..164545a0d7b6ef9b14f9b6b5f211d34f28847026 100755 (executable)
@@ -32,7 +32,7 @@ endif
 
 NT_RM_OBJS = $(ARMV7OBJDIR)/netapi/utils/sockutils.o  $(ARMV7OBJDIR)/netapi/utils/netapi_util_rm.o
 
-DPI_DEMO_OBJS= $(ARMV7OBJDIR)/netapi/demo/src/netapi_dpi_demo.o $(ARMV7OBJDIR)/netapi/demo/src/navl_wrapper.o $(ARMV7OBJDIR)/netapi/demo/src/navl_external_posix.o
+DPI_DEMO_OBJS= $(ARMV7OBJDIR)/netapi/demo/src/transport_dpi_demo.o $(ARMV7OBJDIR)/netapi/demo/src/navl_wrapper.o $(ARMV7OBJDIR)/netapi/demo/src/navl_external_posix.o
 
 # Support Libraries used by dpi-demo 
 CSL_DEVICE ?= -DDEVICE_K2E -DNSS_GEN2
@@ -75,7 +75,7 @@ CFLAGS += $(DEBUG_FLAG) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -
 # Linker options
 INTERNALLINKDEFS = -Wl,--start-group $(LIBS) -Wl,--end-group -lrt -pthread  -L$(ARMV7LIBDIR) -L$(ARMV7SALIBDIR) -L$(NAVL_LIB_DIR)
 
-EXE_NAME=netapi_dpi_demo_$(DEVICE)
+EXE_NAME=transport_dpi_demo
 BIN_DIR = $(ARMV7BINDIR)/netapi/demo
 all: demo install
 
@@ -111,3 +111,12 @@ $(ARMV7OBJDIR)/netapi/utils/.created:
 install:
        install -d $(INSTALL_BIN_BASE_DIR)
        install -c -m 755 $(BIN_DIR)/$(EXE_NAME) $(INSTALL_BIN_BASE_DIR)/$(EXE_NAME)
+       install -d $(SYSCONFDIR)/transportnetlib
+       install -c -m 755 demo/demo_setup_files/transport_dpi_demo_setup.sh    $(SYSCONFDIR)/transportnetlib
+       install -c -m 755 demo/demo_setup_files/index.html               $(SYSCONFDIR)/transportnetlib
+       install -c -m 755 demo/demo_setup_files/dpicgi1.sh               $(SYSCONFDIR)/transportnetlib
+       install -c -m 755 demo/demo_setup_files/dpicgi2.sh               $(SYSCONFDIR)/transportnetlib
+       install -c -m 755 demo/demo_setup_files/dpicgi3.sh               $(SYSCONFDIR)/transportnetlib
+       install -c demo/demo_setup_files/stats1.awk                      $(SYSCONFDIR)/transportnetlib
+       install -c demo/demo_setup_files/stats2.awk                      $(SYSCONFDIR)/transportnetlib
+       install -c demo/demo_setup_files/stats3.awk                      $(SYSCONFDIR)/transportnetlib
diff --git a/ti/runtime/netapi/demo/makefile_armv7 b/ti/runtime/netapi/demo/makefile_armv7
new file mode 100755 (executable)
index 0000000..7be82df
--- /dev/null
@@ -0,0 +1,65 @@
+#*******************************************************************************
+#* FILE PURPOSE: Top level makefile for Creating Component Libraries for ARM
+#* architectures
+#*******************************************************************************
+#* FILE NAME: makefile
+#*
+#* DESCRIPTION: Defines Compiler tools paths, libraries , Build Options 
+#*
+#*
+#*******************************************************************************
+#*
+# (Mandatory) Specify where various tools are installed.
+
+# Output for prebuilt generated libraries
+export ARMV7LIBDIR ?= ./lib
+
+#Enable the following to build for tci6614
+
+
+# ROOT Directory
+export ROOTDIR := ../../..
+
+
+# INCLUDE Directory
+export INCDIR := ../;$(PDK_INSTALL_PATH);$(ROOTDIR)
+
+# Common Macros used in make
+
+ifndef RM
+export RM = rm -f
+endif
+
+ifndef CP
+export CP = cp -p
+endif
+
+export MKDIR = mkdir -p
+
+ifndef RMDIR
+export RMDIR = rm -rf
+endif
+
+ifndef SED
+export SED = sed
+endif
+
+ifndef MAKE
+export MAKE = make
+endif
+
+
+# PHONY Targets
+.PHONY: all install 
+
+# all rule
+all: install 
+
+install:
+       install -d                           $(INSTALL_BIN_BASE_DIR)/plugins
+       $(CP) -r plugins/*                   $(INSTALL_INC_BASE_DIR)/plugins
+       install -d                           $(INSTALL_INC_BASE_DIR)/navl/include
+       $(CP) include/navl.h                 $(INSTALL_INC_BASE_DIR)/navl/include
+       install -d                           $(INSTALL_LIB_BASE_DIR)
+       $(CP) -rp lib/libnavl.so*            $(INSTALL_LIB_BASE_DIR)
+       
index 87744b6a7c1cad8bdc0399abf3e1dc9ca877b22a..64c37930cc2df9fa6735245fcf24feadfad232f3 100755 (executable)
@@ -70,10 +70,10 @@ export CSL_DEVICE = -DDEVICE_K2E -DNSS_GEN2
 endif
 
 # PHONY Targets
-.PHONY: all clean lib tests examples install installbin
+.PHONY: all clean lib tests examples install installbin demo installdemo
 
 # all rule
-all: .executables install installbin
+all: .executables install installbin installdemo
 .executables: lib tests examples
 
 # Make rule to create $(ARMV7LIBDIR)/libnetapi.a library
@@ -112,15 +112,33 @@ installbin:
        install -c -m 755 $(ARMV7BINDIR)/netapi/test/net_test_loopback_$(DEVICE) $(INSTALL_BIN_BASE_DIR)/net_test_loopback_$(DEVICE)
        install -c -m 755 $(ARMV7BINDIR)/netapi/test/net_test_router_$(DEVICE) $(INSTALL_BIN_BASE_DIR)/net_test_router_$(DEVICE)
        install -c -m 755 $(ARMV7BINDIR)/netapi/test/net_test_bench_$(DEVICE) $(INSTALL_BIN_BASE_DIR)/net_test_bench_$(DEVICE)
-       install -d $(SYSCONFDIR)/netapi
-       $(CP) test/net_test_config.txt                        $(SYSCONFDIR)/netapi
-       install -c -m 755 tools/net_test_loopback_setup.sh    $(SYSCONFDIR)/netapi
-       install -c -m 755 tools/net_test_router_setup.sh      $(SYSCONFDIR)/netapi
-       install -c -m 755 tools/irqset.sh                     $(SYSCONFDIR)/netapi
-       install -c -m 755 tools/dsp_core_setup.sh             $(SYSCONFDIR)/netapi
+       install -d $(SYSCONFDIR)/transportnetlib/test
+       $(CP) test/net_test_config.txt                        $(SYSCONFDIR)/transportnetlib/test
+       install -c -m 755 tools/net_test_loopback_setup.sh    $(SYSCONFDIR)/transportnetlib/test
+       install -c -m 755 tools/net_test_router_setup.sh      $(SYSCONFDIR)/transportnetlib/test
+       install -c -m 755 tools/irqset.sh                     $(SYSCONFDIR)/transportnetlib/test
+       install -c -m 755 tools/dsp_core_setup.sh             $(SYSCONFDIR)/transportnetlib/test
+
+installdemo:
+       install -d $(INSTALL_BIN_BASE_DIR)
+       install -c -m 755 $(ARMV7BINDIR)/netapi/demo/transport_dpi_demo $(INSTALL_BIN_BASE_DIR)/
+       install -d $(SYSCONFDIR)/transportnetlib/dpi_demo
+       install -c -m 755 demo/demo_setup_files/transport_dpi_demo_setup.sh    $(SYSCONFDIR)/transportnetlib/dpi_demo
+       install -c -m 755 demo/demo_setup_files/index.html               $(SYSCONFDIR)/transportnetlib/dpi_demo
+       install -c -m 755 demo/demo_setup_files/dpicgi1.sh               $(SYSCONFDIR)/transportnetlib/dpi_demo
+       install -c -m 755 demo/demo_setup_files/dpicgi2.sh               $(SYSCONFDIR)/transportnetlib/dpi_demo
+       install -c -m 755 demo/demo_setup_files/dpicgi3.sh               $(SYSCONFDIR)/transportnetlib/dpi_demo
+       install -c demo/demo_setup_files/stats1.awk                      $(SYSCONFDIR)/transportnetlib/dpi_demo
+       install -c demo/demo_setup_files/stats2.awk                      $(SYSCONFDIR)/transportnetlib/dpi_demo
+       install -c demo/demo_setup_files/stats3.awk                      $(SYSCONFDIR)/transportnetlib/dpi_demo
+
 # Make rule to create tests
 tests:
        -@echo compiling tests 
        @$(MAKE) -f ./test/build/Makefile $@
 
+# Make rule to create net_test_dpi_demo 
+demo:
+       -@echo compiling tests 
+       @$(MAKE) -f ./demo/build/Makefile $@
 examples: