X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=configure.sh;h=2d3e2fecc0d8beadb1dd0ffb7b460f913b64aad7;hp=520afba9454ad0e7ad4ab8a3bb91152f549d7ae3;hb=refs%2Fheads%2Fupstream.niki;hpb=738c81bf3a6b2edaa6f539ea6a24453fbec4c410

diff --git a/configure.sh b/configure.sh
index 520afba..2d3e2fe 100755
--- a/configure.sh
+++ b/configure.sh
@@ -4,11 +4,13 @@
 PREFIX=/usr/local
 PROGS="java javac jar make sed"
 
-CLI=be/nikiroo/fanfix/reader/CliReader
-TUI=
-GUI=be/nikiroo/fanfix/reader/GuiReader
+IMG=be/nikiroo/utils/ui/ImageUtilsAwt
+CLI=be/nikiroo/fanfix/reader/cli/CliReader
+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/TuiReader
-			JTUI="-C bin/ jexer"
-		fi
 	;;
 	--gui) #=no	Disable GUI support (Swing)
 		[ "$val" = no -o "$val" = false ] && GUI= && JGUI=
@@ -76,12 +74,14 @@ 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
 
 cat Makefile.base >> Makefile