diff --git a/Makefile b/Makefile index f8a306e..2a7ceb9 100644 --- a/Makefile +++ b/Makefile @@ -2,16 +2,21 @@ include Rules.make SUBDIRS = src/sdl-instead stead games themes icon desktop doc languages -all: +all: config.make @for dir in $(SUBDIRS); do \ $(MAKE) -C $$dir $(@) || exit 1; \ done; +config.make: + echo "# you can define own flags here" > config.make + +include config.make + clean: @for dir in $(SUBDIRS); do \ $(MAKE) clean -C $$dir $(@) || exit 1; \ done; - echo "# you can define own flags here" > config.make + $(RM) config.make install: all ifeq ($(SYSTEMSETUP), yes) diff --git a/config.make b/config.make deleted file mode 100644 index 4c0e02e..0000000 --- a/config.make +++ /dev/null @@ -1,5 +0,0 @@ -# autamatically generated by configure.sh -LUA_CFLAGS=$(shell pkg-config --cflags lua5.1) -LUA_LFLAGS=$(shell pkg-config --libs lua5.1) -SDL_CFLAGS=$(shell sdl-config --cflags) -SDL_LFLAGS=$(shell sdl-config --libs) -lSDL_ttf -lSDL_mixer -lSDL_image diff --git a/configure.sh b/configure.sh index 33d6c0a..dadb15f 100755 --- a/configure.sh +++ b/configure.sh @@ -70,11 +70,11 @@ echo -n $cc /tmp/sdl-test.c $ops `sdl-config --cflags` `sdl-config --libs` -lSDL if ! $cc /tmp/sdl-test.c $ops `sdl-config --cflags` `sdl-config --libs` -lSDL_ttf -lSDL_mixer -lSDL_image -o /tmp/sdl-test; then echo ") failed". echo "Please, check those dev packages installed: SDL_ttf SDL_mixer SDL_image." - rm /tmp/sdl-test.c /tmp/sdl-test + rm -f /tmp/sdl-test.c /tmp/sdl-test exit 1 fi echo ") ok" -rm /tmp/sdl-test.c /tmp/sdl-test +rm -f /tmp/sdl-test.c /tmp/sdl-test if ! make clean >/dev/null 2>&1; then echo " * Warning!!! Can not do make clean..." fi diff --git a/desktop/Makefile b/desktop/Makefile index 2dd3173..771c014 100644 --- a/desktop/Makefile +++ b/desktop/Makefile @@ -1,4 +1,6 @@ include ../Rules.make +include ../config.make + clean: rm -rf instead.desktop diff --git a/doc/Makefile b/doc/Makefile index 9abf690..6367f28 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,4 +1,6 @@ include ../Rules.make +include ../config.make + pdf: pdflatex manual.tex pdflatex manual.tex diff --git a/games/Makefile b/games/Makefile index 7253c5c..becc163 100644 --- a/games/Makefile +++ b/games/Makefile @@ -1,4 +1,6 @@ include ../Rules.make +include ../config.make + all: install: $(INSTALLD) $(GAMESPATH) diff --git a/icon/Makefile b/icon/Makefile index 9cbde5c..69a59c2 100644 --- a/icon/Makefile +++ b/icon/Makefile @@ -1,4 +1,6 @@ include ../Rules.make +include ../config.make + clean: all: install: diff --git a/languages/Makefile b/languages/Makefile index 19fa96a..4a86eaa 100644 --- a/languages/Makefile +++ b/languages/Makefile @@ -1,4 +1,6 @@ include ../Rules.make +include ../config.make + clean: all: install: diff --git a/stead/Makefile b/stead/Makefile index a9835dd..005a4a7 100644 --- a/stead/Makefile +++ b/stead/Makefile @@ -1,4 +1,6 @@ include ../Rules.make +include ../config.make + clean: all: stead.lua diff --git a/themes/Makefile b/themes/Makefile index 0405adf..28ee175 100644 --- a/themes/Makefile +++ b/themes/Makefile @@ -1,4 +1,6 @@ include ../Rules.make +include ../config.make + clean: all: install: