# HG changeset patch # User Sam Lantinga # Date 1144986991 0 # Node ID 14f302c5b32cbc22fee1212fe3b627aaed8fadcb # Parent b17ca8c3a4040d1023d62ced511d548cc5a0d57b Don't hardcode the output directory diff -r b17ca8c3a404 -r 14f302c5b32c Makefile.in --- a/Makefile.in Fri Apr 14 03:24:01 2006 +0000 +++ b/Makefile.in Fri Apr 14 03:56:31 2006 +0000 @@ -61,11 +61,11 @@ .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: - @SOURCES="$(SOURCES)" INCLUDE="$(INCLUDE)" objects="$(objects)" output="$(depend)" \ + @SOURCES="$(SOURCES)" INCLUDE="$(INCLUDE)" output="$(depend)" \ $(SHELL) $(auxdir)/makedep.sh @for src in $(SDLMAIN_SOURCES); do \ 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); \ done diff -r b17ca8c3a404 -r 14f302c5b32c build-scripts/makedep.sh --- a/build-scripts/makedep.sh Fri Apr 14 03:24:01 2006 +0000 +++ b/build-scripts/makedep.sh Fri Apr 14 03:56:31 2006 +0000 @@ -3,8 +3,8 @@ # Generate dependencies from a list of source files # 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 - echo "SOURCES, INCLUDE, objects, and output needs to be set" +if test x"$INCLUDE" = x -o x"$SOURCES" = x -o x"$output" = x; then + echo "SOURCES, INCLUDE, and output needs to be set" exit 1 fi cache_prefix=".#$$" @@ -41,8 +41,8 @@ for src in $SOURCES do echo "Generating dependencies for $src" ext=`echo $src | sed 's|.*\.\(.*\)|\1|'` - obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|$objects/\1.lo|g"` - echo "$obj: $src \\" >>${output}.new + obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|\1.lo|g"` + echo "\$(objects)/$obj: $src \\" >>${output}.new search_deps $src | sort | uniq >>${output}.new case $ext in c) cat >>${output}.new <<__EOF__