X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=configure.sh;h=15ae18088ba8d961b401fa8187334898ebe17fad;hb=505be508ae7d3fb48122be548b310a238cfb91eb;hp=7d87f4c6bfd4ad547c0074f0cbd596964ade29d8;hpb=9119671d3774c0b74ce8661b5262ff14e6bfb010;p=fanfix.git

diff --git a/configure.sh b/configure.sh
index 7d87f4c..15ae180 100755
--- a/configure.sh
+++ b/configure.sh
@@ -4,9 +4,14 @@
 PREFIX=/usr/local
 PROGS="java javac jar make sed"
 
-CLI=be/nikiroo/fanfix/reader/CliReader
-TUI=be/nikiroo/fanfix/reader/TuiReader
-GUI=be/nikiroo/fanfix/reader/LocalReader
+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="-C bin/ jexer"
+JGUI=
 
 valid=true
 while [ "$*" != "" ]; do
@@ -27,13 +32,13 @@ while [ "$*" != "" ]; do
 		PREFIX="$val"
 	;;
 	--cli) #=no	Disable CLI support (System.out)
-		[ "$val" = no -o "$val" = false ] && CLI=
+		[ "$val" = no -o "$val" = false ] && CLI= && JCLI=
 	;;
-	--tui) #=no	Disable TUI support (Jexer)
-		[ "$val" = no -o "$val" = false ] && TUI=
+	--tui) #=no	Enable TUI support (Jexer)
+		[ "$val" = no -o "$val" = false ] && TUI= && JTUI=
 	;;
 	--gui) #=no	Disable GUI support (Swing)
-		[ "$val" = no -o "$val" = false ] && GUI=
+		[ "$val" = no -o "$val" = false ] && GUI= && JGUI=
 	;;
 	*)
 		echo "Unsupported parameter: '$1'" >&2
@@ -63,19 +68,21 @@ if [ "`whereis tput`" = "tput:" ]; then
 	ko='"[ !! ]"';
 	cols=80;
 else
-	ok='"`tput bold`[`tput setf 2` OK `tput init``tput bold`]`tput init`"';
-	ko='"`tput bold`[`tput setf 4` !! `tput init``tput bold`]`tput init`"';
+	#ok='"`tput bold`[`tput setf 2` OK `tput init``tput bold`]`tput init`"';
+	#ko='"`tput bold`[`tput setf 4` !! `tput init``tput bold`]`tput init`"';
+	ok='"`tput bold`[`tput setaf 2` OK `tput init``tput bold`]`tput init`"';
+	ko='"`tput bold`[`tput setaf 1` !! `tput init``tput bold`]`tput init`"';
 	cols='"`tput cols`"';
 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 -C bin/ jexer -C bin/ be -C bin/ VERSION" >> 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