oreolek/adventin
Archived
1
0
Fork 0
Code Pull requests Releases Activity

config.make fix

Browse source
This commit is contained in:
p.kosyh 2009-11-08 14:33:23 +00:00
parent cfd5efa0d5
commit 4a0c8adab1
10 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -2,16 +2,21 @@ include Rules.make
SUBDIRS = src/sdl-instead stead games themes icon desktop doc languages SUBDIRS = src/sdl-instead stead games themes icon desktop doc languages
all: all: config.make
@for dir in $(SUBDIRS); do \ @for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir $(@) || exit 1; \ $(MAKE) -C $$dir $(@) || exit 1; \
done; done;
config.make:
echo "# you can define own flags here" > config.make
include config.make
clean: clean:
@for dir in $(SUBDIRS); do \ @for dir in $(SUBDIRS); do \
$(MAKE) clean -C $$dir $(@) || exit 1; \ $(MAKE) clean -C $$dir $(@) || exit 1; \
done; done;
echo "# you can define own flags here" > config.make $(RM) config.make
install: all install: all
ifeq ($(SYSTEMSETUP), yes) ifeq ($(SYSTEMSETUP), yes)

5
config.make
View file

@ -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

4
configure.sh
View file

@ -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 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 ") failed".
echo "Please, check those dev packages installed: SDL_ttf SDL_mixer SDL_image." 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 exit 1
fi fi
echo ") ok" 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 if ! make clean >/dev/null 2>&1; then
echo " * Warning!!! Can not do make clean..." echo " * Warning!!! Can not do make clean..."
fi fi

2
desktop/Makefile
View file

@ -1,4 +1,6 @@
include ../Rules.make include ../Rules.make
include ../config.make
clean: clean:
rm -rf instead.desktop rm -rf instead.desktop

2
doc/Makefile
View file

@ -1,4 +1,6 @@
include ../Rules.make include ../Rules.make
include ../config.make
pdf: pdf:
pdflatex manual.tex pdflatex manual.tex
pdflatex manual.tex pdflatex manual.tex

2
games/Makefile
View file

@ -1,4 +1,6 @@
include ../Rules.make include ../Rules.make
include ../config.make
all: all:
install: install:
$(INSTALLD) $(GAMESPATH) $(INSTALLD) $(GAMESPATH)

2
icon/Makefile
View file

@ -1,4 +1,6 @@
include ../Rules.make include ../Rules.make
include ../config.make
clean: clean:
all: all:
install: install:

2
languages/Makefile
View file

@ -1,4 +1,6 @@
include ../Rules.make include ../Rules.make
include ../config.make
clean: clean:
all: all:
install: install:

2
stead/Makefile
View file

@ -1,4 +1,6 @@
include ../Rules.make include ../Rules.make
include ../config.make
clean: clean:
all: stead.lua all: stead.lua

2
themes/Makefile
View file

@ -1,4 +1,6 @@
include ../Rules.make include ../Rules.make
include ../config.make
clean: clean:
all: all:
install: install: