X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=configure.sh;h=4256eb36f1952e465a17dd932a9b4519721af527;hp=4105d93af276c9420f87a8e7569576d5544b2a3b;hb=601003e69e1dc81774243c6eadf7982b6b563b33;hpb=805005449dacb1e7b825db63836bf100e472ddd0

diff --git a/configure.sh b/configure.sh
index 4105d93..4256eb3 100755
--- a/configure.sh
+++ b/configure.sh
@@ -5,9 +5,7 @@ PREFIX=/usr/local
 PROGS="java javac jar"
 
 UI=be/nikiroo/utils/ui/test/TestUI
-JUI="-C bin/ be/nikiroo/utils/ui"
 ANDOIRD=
-JANDROID=
 
 valid=true
 while [ "$*" != "" ]; do
@@ -29,14 +27,12 @@ while [ "$*" != "" ]; do
 		[ "$val" = no -o "$val" = false ] && UI= && JUI=
 		if [ "$val" = yes -o "$val" = true ]; then
 			UI=be/nikiroo/utils/ui/test/TestUI
-			JUI="-C bin/ be/nikiroo/utils/ui"
 		fi
 	;;
 	--android) #=yes	Enable Android UI support
 		[ "$val" = no -o "$val" = false ] && ANDROID= && JANDROID=
 		if [ "$val" = yes -o "$val" = true ]; then
 			ANDROID=be/nikiroo/utils/android/test/TestAndroid
-			JANDROID="-C bin/ be/nikiroo/utils/android"
 		fi
 	;;
 	*)
@@ -71,14 +67,14 @@ else
 fi;
 
 
-echo "MAIN = be/nikiroo/utils/test/Test" > Makefile
+echo "MAIN = be/nikiroo/utils/test_code/Test" > Makefile
 echo "MORE = $UI $ANDROID" >> Makefile
-echo "TEST = be/nikiroo/utils/test/Test" >> Makefile
+echo "TEST = be/nikiroo/utils/test_code/Test" >> Makefile
 echo "TEST_PARAMS = $cols $ok $ko" >> Makefile
 echo "NAME = nikiroo-utils" >> Makefile
 echo "PREFIX = $PREFIX" >> Makefile
-echo "JAR_FLAGS += -C bin/ be $JUI $JANDROID -C bin/ VERSION" >> Makefile
-echo "SJAR_FLAGS += -C src/ org -C src/ be" >> Makefile
+echo "JAR_FLAGS += -C bin/ be -C bin/ org -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
+echo "SJAR_FLAGS += -C src/ org -C src/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
 
 cat Makefile.base >> Makefile