X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=configure.sh;h=8c5dbdd63784494141a1498fbbab1021d62d571f;hp=15ae18088ba8d961b401fa8187334898ebe17fad;hb=59e9bd1e353b9d01cee7da6055ebd36d8d045d3a;hpb=97654d115d9f0286f9eea9fe50216cb3737e9ed6 diff --git a/configure.sh b/configure.sh index 15ae180..8c5dbdd 100755 --- a/configure.sh +++ b/configure.sh @@ -5,13 +5,6 @@ PREFIX=/usr/local PROGS="java javac jar make sed" 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 @@ -31,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= && JCLI= - ;; - --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= && JGUI= - ;; *) echo "Unsupported parameter: '$1'" >&2 echo >&2 @@ -76,13 +60,13 @@ else fi; echo "MAIN = be/nikiroo/fanfix/Main" > Makefile -echo "MORE = $CLI $TUI $GUI $IMG" >> 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 $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 +echo "JAR_FLAGS += -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