pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't hardcode the output directory

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401641
This commit is contained in:
Sam Lantinga 2006-04-14 03:56:31 +00:00
parent ee42a1018d
commit a5e03023d5
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.in
View file

@ -61,11 +61,11 @@ $(objects):
.PHONY: all depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist .PHONY: all depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist
depend: depend:
@SOURCES="$(SOURCES)" INCLUDE="$(INCLUDE)" objects="$(objects)" output="$(depend)" \ @SOURCES="$(SOURCES)" INCLUDE="$(INCLUDE)" output="$(depend)" \
$(SHELL) $(auxdir)/makedep.sh $(SHELL) $(auxdir)/makedep.sh
@for src in $(SDLMAIN_SOURCES); do \ @for src in $(SDLMAIN_SOURCES); do \
obj=`echo $$src | sed -e 's|.*/||' -e 's|\.[^\.]*$$|.o|'`; \ obj=`echo $$src | sed -e 's|.*/||' -e 's|\.[^\.]*$$|.o|'`; \
echo "$(objects)/$$obj: $$src" >>$(depend); \ echo "\$$(objects)/$$obj: $$src" >>$(depend); \
echo " \$$(CC) \$$(CFLAGS) \$$(EXTRA_CFLAGS) -c $$src -o \$$@" >>$(depend); \ echo " \$$(CC) \$$(CFLAGS) \$$(EXTRA_CFLAGS) -c $$src -o \$$@" >>$(depend); \
done done

8
build-scripts/makedep.sh
View file

@ -3,8 +3,8 @@
# Generate dependencies from a list of source files # Generate dependencies from a list of source files
# Check to make sure our environment variables are set # Check to make sure our environment variables are set
if test x"$INCLUDE" = x -o x"$SOURCES" = x -o x"$objects" = x -o x"$output" = x; then if test x"$INCLUDE" = x -o x"$SOURCES" = x -o x"$output" = x; then
echo "SOURCES, INCLUDE, objects, and output needs to be set" echo "SOURCES, INCLUDE, and output needs to be set"
exit 1 exit 1
fi fi
cache_prefix=".#$$" cache_prefix=".#$$"
@ -41,8 +41,8 @@ search_deps()
for src in $SOURCES for src in $SOURCES
do echo "Generating dependencies for $src" do echo "Generating dependencies for $src"
ext=`echo $src | sed 's|.*\.\(.*\)|\1|'` ext=`echo $src | sed 's|.*\.\(.*\)|\1|'`
obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|$objects/\1.lo|g"` obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|\1.lo|g"`
echo "$obj: $src \\" >>${output}.new echo "\$(objects)/$obj: $src \\" >>${output}.new
search_deps $src | sort | uniq >>${output}.new search_deps $src | sort | uniq >>${output}.new
case $ext in case $ext in
c) cat >>${output}.new <<__EOF__ c) cat >>${output}.new <<__EOF__