X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=configure.sh;h=4256eb36f1952e465a17dd932a9b4519721af527;hp=6179aae888887bf44e0be8ddbffbac9d7201bbaf;hb=62924cf3473d5b8d3ce827135d4c201f3879a359;hpb=fbcc2a2acb39e4c0bbbc805ece1f8ecf2206f951 diff --git a/configure.sh b/configure.sh index 6179aae..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 ;; *) @@ -77,8 +73,8 @@ 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