Skip to content
Permalink
Browse files

Blargle-fnargle dependencies and build rules

  • Loading branch information
slouken committed Feb 20, 2006
1 parent f7f2883 commit b3a340d3553ce1594376403195c0abd7683ef1f7
Showing with 30 additions and 38 deletions.
  1. +9 −13 Makefile.in
  2. +21 −25 build-scripts/makedep.sh
@@ -11,6 +11,7 @@ libdir = $(DESTDIR)@libdir@
includedir = $(DESTDIR)@includedir@
datadir = $(DESTDIR)@datadir@
mandir = $(DESTDIR)@mandir@
auxdir = @ac_aux_dir@
distpath = $(srcdir)/..
distdir = SDL-@SDL_VERSION@
distfile = $(distdir).tar.gz
@@ -31,11 +32,6 @@ 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 `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) `echo $? | sed 's| .*||'` -o $@

LT_AGE = @LT_AGE@
LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
@@ -48,12 +44,12 @@ Makefile: $(srcdir)/Makefile.in
$(SHELL) config.status $@

$(objects):
$(SHELL) @ac_aux_dir@/mkinstalldirs $@
$(SHELL) $(auxdir)/mkinstalldirs $@

.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)" \
$(SHELL) @ac_aux_dir@/makedep.sh
$(SHELL) $(auxdir)/makedep.sh

include $(depend)

@@ -62,23 +58,23 @@ $(objects)/$(TARGET): $(OBJECTS)

install: install-bin install-hdrs install-lib install-data install-man
install-bin:
$(SHELL) @ac_aux_dir@/mkinstalldirs $(bindir)
$(SHELL) $(auxdir)/mkinstalldirs $(bindir)
$(INSTALL) -m 755 $(srcdir)/sdl-config $(bindir)/sdl-config
install-hdrs:
$(SHELL) @ac_aux_dir@/mkinstalldirs $(includedir)/SDL
$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL
for src in $(srcdir)/include/*.h; do \
file=`echo $$src | sed -e 's|^.*/||'`; \
$(INSTALL) $$src $(includedir)/SDL/$$file; \
done
$(INSTALL) include/SDL_config.h $(includedir)/SDL/SDL_config.h
install-lib:
$(SHELL) @ac_aux_dir@/mkinstalldirs $(libdir)
$(SHELL) $(auxdir)/mkinstalldirs $(libdir)
$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
install-data:
$(SHELL) @ac_aux_dir@/mkinstalldirs $(datadir)/aclocal
$(SHELL) $(auxdir)/mkinstalldirs $(datadir)/aclocal
$(INSTALL) $(srcdir)/sdl.m4 $(datadir)/aclocal/sdl.m4
install-man:
$(SHELL) @ac_aux_dir@/mkinstalldirs $(mandir)/man3
$(SHELL) $(auxdir)/mkinstalldirs $(mandir)/man3
for src in $(srcdir)/docs/man3/*.3; do \
file=`echo $$src | sed -e 's|^.*/||'`; \
$(INSTALL) $$src $(mandir)/man3/$$file; \
@@ -120,7 +116,7 @@ distclean: clean
if test -f test/Makefile; then (cd test; $(MAKE) $@); fi

dist $(distfile):
$(SHELL) @ac_aux_dir@/mkinstalldirs $(distdir)
$(SHELL) $(auxdir)/mkinstalldirs $(distdir)
tar cf - $(DIST) | (cd $(distdir); tar xf -)
rm -rf `find $(distdir) -name CVS`
rm -f `find $(distdir) -name '.cvsignore'`
@@ -2,6 +2,11 @@
#
# Generate dependencies from a list of source files

BUILDC="\\\$\\(LIBTOOL\\) --mode=compile \\\$\\(CC\\) \\\$\\(CFLAGS\\) -c \$src -o \\\$@"
BUILDCC=$BUILDC
BUILDM=$BUILDC
BUILDASM="\\\$\\(LIBTOOL\\) --tag=CC --mode=compile \\\$\\(auxdir\\)/strip_fPIC.sh \\\$\\(NASM\\) \$src -o \\\$@"

# 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"
@@ -21,27 +26,19 @@ search_deps()
while read file
do cache=${cache_prefix}_`generate_var $file`
if test -f $cache; then
# We already ahve this cached
if test x$2 = x; then
cat $cache
else
cat $cache >>$2
fi
continue;
: # We already ahve this cached
else
: >$cache
for path in $base `echo $INCLUDE | sed 's|-I||g'`
do dep="$path/$file"
if test -f "$dep"; then
echo " $dep \\" >>$cache
search_deps $dep >>$cache
break
fi
done
fi
for path in $base `echo $INCLUDE | sed 's|-I||g'`
do dep="$path/$file"
if test -f "$dep"; then
echo " $dep \\" >>$cache
if test x$2 = x; then
echo " $dep \\"
else
echo " $dep \\" >>$2
fi
search_deps $dep $cache
break
fi
done
cat $cache
done
}

@@ -54,13 +51,12 @@ do echo "Generating dependencies for $src"
search_deps $src | sort | uniq >>${output}.new
echo "" >>${output}.new
case $ext in
asm) echo " \$(BUILDASM)" >>${output}.new;;
cc) echo " \$(BUILDCC)" >>${output}.new;;
c) echo " \$(BUILDC)" >>${output}.new;;
m) echo " \$(BUILDM)" >>${output}.new;;
c) eval echo \\" $BUILDC\\" >>${output}.new;;
cc) eval echo \\" $BUILDCC\\" >>${output}.new;;
m) eval echo \\" $BUILDM\\" >>${output}.new;;
asm) eval echo \\" $BUILDASM\\" >>${output}.new;;
*) echo "Unknown file extension: $ext";;
esac
echo "" >>${output}.new
done
rm -f ${cache_prefix}*
mv ${output}.new ${output}

0 comments on commit b3a340d

Please sign in to comment.