Skip to content
Permalink
Browse files

Fixed build dependencies... ugh

  • Loading branch information
slouken committed Feb 20, 2006
1 parent e8b3cbc commit f6762cbf1b86c40c269e9c279d1cfcb01e2b95bc
Showing with 18 additions and 18 deletions.
  1. +3 −3 Makefile.in
  2. +15 −15 build-scripts/makedep.sh
@@ -31,9 +31,9 @@ OBJECTS = @OBJECTS@

DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html EpocBuildFiles.zip include INSTALL Makefile.dc Makefile.in MPWmake.sea.bin PBProjects.tar.gz README* sdl-config.in sdl.m4 SDL.qpg.in SDL.spec SDL.spec.in setvars.cmd src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom.mif WhatsNew Xcode21.tar.gz Xcode.tar.gz XcodeUniversal.tar.gz

BUILDC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $? -o $@
BUILDCC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $? -o $@
BUILDM = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $? -o $@
BUILDC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
BUILDCC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
BUILDM = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'` -o $@
BUILDASM = $(LIBTOOL) --tag=CC --mode=compile @ac_aux_dir@/strip_fPIC.sh $(NASM) $? -o $@

LT_AGE = @LT_AGE@
@@ -22,37 +22,37 @@ search_deps()
do cache=${cache_prefix}_`generate_var $file`
if test -f $cache; then
# We already ahve this cached
cat $cache
if test x$2 = x; then
cat $cache
else
cat $cache >>$2
fi
continue;
fi
for path in $base `echo $INCLUDE | sed 's|-I||g'`
do dep="$path/$file"
if test -f "$dep"; then
echo " $dep \\" >$cache
echo " $dep \\"
generate_dep $dep
echo " $dep \\" >>$cache
if test x$2 = x; then
echo " $dep \\"
else
echo " $dep \\" >>$2
fi
search_deps $dep $cache
break
fi
done
done
}

generate_dep()
{
cat >>${output}.new <<__EOF__
$1: \\
`search_deps $1`
__EOF__
}

:>${output}.new
for src in $SOURCES
do echo "Generating dependencies for $src"
generate_dep $src
ext=`echo $src | sed 's|.*\.\(.*\)|\1|'`
obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|$objects/\1.lo|g"`
echo "$obj: $src" >>${output}.new
echo "$obj: $src \\" >>${output}.new
search_deps $src | sort | uniq >>${output}.new
echo "" >>${output}.new
case $ext in
asm) echo " \$(BUILDASM)" >>${output}.new;;
cc) echo " \$(BUILDCC)" >>${output}.new;;

0 comments on commit f6762cb

Please sign in to comment.