Change build path.

diff --git a/script/Makefile b/script/Makefile
new file mode 100644 (file)
index 0000000..e67f04c
--- /dev/null
+++ b/script/Makefile
@@ -0,0 +1,71 @@
+#============================================================================
+# Name        : Makefile (transtreamproxy)
+# Author      : oskwon(kos@dev3)
+# Version     : 
+# Copyright   : Copyright(c)2013 Vu+ Team. All right reserved.
+# Description :
+#============================================================================
+
+-include config.mk
+
+ifeq ($(MODEL),)
+$(error config.mk is not set. please run script.config before make.)
+endif
+
+MAJOR = 3
+MINOR = 0
+PROJECT = transtreamproxy
+
+TOP=$(PWD)/..
+OBJ=./obj/
+
+CROSS=$(OETOP)/$(MODEL)/build/tmp/cross/mipsel/bin/mipsel-oe-linux-
+SYSROOT=$(OETOP)/$(MODEL)/build/tmp/staging/mipsel-oe-linux
+
+RM=rm -Rf
+CXX=$(CROSS)g++
+LD=$(CROSS)ld
+STRIP=$(CROSS)strip
+UPLOAD=$(TOP)/script/script.upload
+
+SRCS = $(shell find ../src/ -name "*.cpp")
+OBJS=$(SRCS:.cpp=.o)
+
+CFLAGS += -D_MAJOR=$(MAJOR) -D_MINOR=$(MINOR) 
+CFLAGS += -O2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -I../src -I../src/external -I$(SYSROOT)/usr/include 
+LDFLAGS += -L$(SYSROOT)/usr/lib -lpthread -lrt
+
+.SUFFIXES : .cpp .o
+.PHONY : all clean install .showinfo .prepare $(PROJECT)
+
+.cpp.o: 
+       $(CXX) -c $(CFLAGS) -o $(OBJ)$(notdir $@) $<
+
+all: .showinfo .prepare $(PROJECT)
+
+$(PROJECT):$(OBJS)
+       $(CXX) -o $@ $(addprefix $(OBJ), $(notdir $(OBJS))) $(LDFLAGS)
+       $(STRIP) $@
+
+install:
+       @$(UPLOAD) $(IP) . $(PROJECT) $(UPDIR)
+
+clean:
+       $(RM) $(PROJECT) obj *.log *.o
+
+.prepare:
+       @if [ ! -e obj ]; then mkdir obj; fi
+
+.showinfo:
+       @echo "-----------------------------------------------------"
+       @echo "                [ BUILD ENVIRONMENT ]                "
+       @echo "-----------------------------------------------------"
+       @echo "PROJECT  : "$(PROJECT)" (v"$(MAJOR)"."$(MINOR)")"
+       @echo ""
+       @echo "CXX      : "$(CXX)
+       @echo "LD       : "$(LD)
+       @echo "STRIP    : "$(STRIP)
+       @echo "CFLAGS   : "$(CFLAGS)
+       @echo "LDFLAGS  : "$(LDFLAGS)
+       @echo "-----------------------------------------------------"
+       @echo

diff --git a/script/script.config b/script/script.config
index 3f85083..4ef3bc1 100755 (executable)
--- a/script/script.config
+++ b/script/script.config
@@ -3,8 +3,9 @@
 IP=192.168.0.1
 MODEL=vusolo2
 OETOP=/openembedded/path/here
+UPDIR=/home/root
 
-CONFIG_PATH=$PWD/../config.mk
+CONFIG_PATH=$PWD/config.mk
 
 function getValue() {
     IN=$1
@@ -18,17 +19,20 @@ if [ -e $CONFIG_PATH ]; then
     IP="$(getValue `cat $CONFIG_PATH | grep 'IP='`)"
     MODEL="$(getValue `cat $CONFIG_PATH | grep 'MODEL='`)"
     OETOP="$(getValue `cat $CONFIG_PATH | grep 'OETOP='`)"
+    UPDIR="$(getValue `cat $CONFIG_PATH | grep 'UPDIR='`)"
 fi
 
 # input new config.
-read -p "Please, input target ip [$IP] : " NEW_IP
 read -p "Please, input model name [$MODEL] : " NEW_MODEL
 read -p "Please, input openembeded root path [$OETOP] : " NEW_OETOP
+read -p "Please, input target ip [$IP] : " NEW_IP
+read -p "Please, input upload path [$UPDIR] : " NEW_UPDIR
 
 # check new config value.
 if [ ! -z $NEW_IP ]; then IP=$NEW_IP;          fi
 if [ ! -z $NEW_MODEL ]; then MODEL=$NEW_MODEL; fi
 if [ ! -z $NEW_OETOP ]; then OETOP=$NEW_OETOP; fi
+if [ ! -z $NEW_UPDIR ]; then UPDIR=$NEW_UPDIR; fi
 
 # backup config file.
 if [ -e $CONFIG_PATH ]; then
@@ -40,3 +44,5 @@ echo "MODEL=$MODEL"  > $CONFIG_PATH
 echo "OETOP=$OETOP" >> $CONFIG_PATH
 echo ""             >> $CONFIG_PATH
 echo "IP=$IP"       >> $CONFIG_PATH
+echo ""             >> $CONFIG_PATH
+echo "UPDIR=$UPDIR" >> $CONFIG_PATH

diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644 (file)
index 370aa1a..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#============================================================================
-# Name        : Makefile (transtreamproxy)
-# Author      : oskwon(kos@dev3)
-# Version     : 
-# Copyright   : Copyright(c)2013 Vu+ Team. All right reserved.
-# Description :
-#============================================================================
-
--include ../config.mk
-
-ifeq ($(MODEL),)
-$(error config.mk is not set. please run script.config before make.)
-endif
-
-MAJOR = 3
-MINOR = 0
-PROJECT = transtreamproxy
-
-TOP=$(PWD)/..
-
-CROSS=$(OETOP)/$(MODEL)/build/tmp/cross/mipsel/bin/mipsel-oe-linux-
-SYSROOT=$(OETOP)/$(MODEL)/build/tmp/staging/mipsel-oe-linux
-
-RM=rm -f
-CXX=$(CROSS)g++
-LD=$(CROSS)ld
-STRIP=$(CROSS)strip
-UPLOAD=$(TOP)/script/script.upload
-
-SRCS = $(shell find . -name "*.cpp")
-OBJS=$(SRCS:.cpp=.o)
-
-CFLAGS += -D_MAJOR=$(MAJOR) -D_MINOR=$(MINOR) 
-CFLAGS += -O2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -I. -I./external -I$(SYSROOT)/usr/include 
-LDFLAGS += -L$(SYSROOT)/usr/lib -lpthread -lrt
-
-.SUFFIXES : .cpp .o
-.PHONY : all clean install .showinfo
-
-.cpp.o: 
-       $(CXX) -c $(CFLAGS) -o $@ $<
-
-all: .showinfo $(PROJECT)
-
-$(PROJECT):$(OBJS)
-       $(CXX) -o $@ $(OBJS) $(LDFLAGS)
-       $(STRIP) $@
-
-install:
-       @$(UPLOAD) $(IP) . $(PROJECT) /usr/bin
-
-clean:
-       $(RM) $(PROJECT) $(OBJS) *.log *.o
-
-.showinfo:
-       @echo "-----------------------------------------------------"
-       @echo "                [ BUILD ENVIRONMENT ]                "
-       @echo "-----------------------------------------------------"
-       @echo "PROJECT  : "$(PROJECT)" (v"$(MAJOR)"."$(MINOR)")"
-       @echo ""
-       @echo "CXX      : "$(CXX)
-       @echo "LD       : "$(LD)
-       @echo "STRIP    : "$(STRIP)
-       @echo "CFLAGS   : "$(CFLAGS)
-       @echo "LDFLAGS  : "$(LDFLAGS)
-       @echo "-----------------------------------------------------"
-       @echo