X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=configure.sh;h=1e12397d0e9d81e6ee3c588018d89f516209ccc3;hb=0c7a66371e9fbf37a5348df63ed1b6dac32142f8;hp=714f2f4f0ae2eddc9d410c16a2fcdd7017fc7378;hpb=9b05b757e2e817cd4ecd561032a66f63c158398d;p=fanfix.git

diff --git a/configure.sh b/configure.sh
index 714f2f4..1e12397 100755
--- a/configure.sh
+++ b/configure.sh
@@ -4,11 +4,13 @@
 PREFIX=/usr/local
 PROGS="java javac jar make sed"
 
+IMG=be/nikiroo/utils/ui/ImageUtilsAwt
 CLI=be/nikiroo/fanfix/reader/cli/CliReader
-TUI=
+TUI=be/nikiroo/fanfix/reader/tui/TuiReader
 GUI=be/nikiroo/fanfix/reader/ui/GuiReader
+JIMG=
 JCLI=
-JTUI=
+JTUI="-C bin/ jexer"
 JGUI=
 
 valid=true
@@ -32,12 +34,8 @@ while [ "$*" != "" ]; do
 	--cli) #=no	Disable CLI support (System.out)
 		[ "$val" = no -o "$val" = false ] && CLI= && JCLI=
 	;;
-	--tui) #=yes	Enable TUI support (Jexer, experimental)
+	--tui) #=no	Enable TUI support (Jexer)
 		[ "$val" = no -o "$val" = false ] && TUI= && JTUI=
-		if [ "$val" = yes -o "$val" = true ]; then
-			TUI=be/nikiroo/fanfix/reader/tui/TuiReader
-			JTUI="-C bin/ jexer"
-		fi
 	;;
 	--gui) #=no	Disable GUI support (Swing)
 		[ "$val" = no -o "$val" = false ] && GUI= && JGUI=
@@ -76,15 +74,13 @@ else
 fi;
 
 echo "MAIN = be/nikiroo/fanfix/Main" > Makefile
-echo "MORE = $CLI $TUI $GUI" >> Makefile
+echo "MORE = $CLI $TUI $GUI $IMG" >> Makefile
 echo "TEST = be/nikiroo/fanfix/test/Test" >> Makefile
 echo "TEST_PARAMS = $cols $ok $ko" >> Makefile
 echo "NAME = fanfix" >> Makefile
 echo "PREFIX = $PREFIX" >> Makefile
-echo "JAR_FLAGS += -C bin/ org $JCLI $JTUI $JGUI -C bin/ be -C bin/ VERSION" >> Makefile
-echo "RM_FOR_ANDROID = jexer be/nikiroo/utils/ui be/nikiroo/fanfix/reader/tui be/nikiroo/fanfix/reader/ui" >> Makefile
-echo "ID_FOR_ANDROID = be.nikiroo.fanfix.reader.android" >> Makefile
-#echo "SJAR_FLAGS += -C src/ org -C src/ jexer -C src/ be -C ./ LICENSE -C ./ README.md -C ./ VERSION" >> Makefile
+echo "JAR_FLAGS += -C bin/ org $JCLI $JTUI $JGUI -C bin/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
+#echo "SJAR_FLAGS += -C src/ org -C src/ jexer -C src/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
 
 cat Makefile.base >> Makefile