X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=configure.sh;h=4177ea9a1611929e9fd2cbb31537978ce664087b;hp=3e3be81fa99d7feccdd173e906ae8197576c6576;hb=36e2f4c4d68606c04692f60876fbdd2368ea01a5;hpb=c0fba8d53678f67e049deeb799773a9f31f02f8d

diff --git a/configure.sh b/configure.sh
index 3e3be81..4177ea9 100755
--- a/configure.sh
+++ b/configure.sh
@@ -4,9 +4,7 @@
 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/GuiReader
+IMG=be/nikiroo/utils/ui/ImageUtilsAwt
 
 valid=true
 while [ "$*" != "" ]; do
@@ -26,15 +24,6 @@ while [ "$*" != "" ]; do
 	--prefix) #=PATH	Change the prefix to the given path
 		PREFIX="$val"
 	;;
-	--cli) #=no	Disable CLI support (System.out)
-		[ "$val" = no -o "$val" = false ] && CLI=
-	;;
-	--tui) #=no	Disable TUI support (Jexer)
-		[ "$val" = no -o "$val" = false ] && TUI=
-	;;
-	--gui) #=no	Disable GUI support (Swing)
-		[ "$val" = no -o "$val" = false ] && GUI=
-	;;
 	*)
 		echo "Unsupported parameter: '$1'" >&2
 		echo >&2
@@ -63,19 +52,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 = $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 ./ src/ -C bin/ org -C bin/ be -C ./ LICENSE -C ./ VERSION -C libs/ licenses" >> Makefile
+echo "SJAR_FLAGS += -C src/ org -C src/ be" >> Makefile
 
 cat Makefile.base >> Makefile