summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2008-10-12 22:52:42 +0000
committerMåns Rullgård <mans@mansr.com>2008-10-12 22:52:42 +0000
commit53bd9d923a86f2c3d8a9bb81b4bba8700665a973 (patch)
treeed1cda0a30edc44fa3f37a9604c24e1d5127b270 /configure
parent5eb39de901d84c189abf272a56a836527ca75bef (diff)
Revert "Replace sed trickery in the gcc dependency generation command"
This made dependencies entirely non-functional, and also the syntax is not supported by gcc 2.95. Originally committed as revision 15607 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 2 insertions, 3 deletions
diff --git a/configure b/configure
index a5b9fbf16d..f47432c2d8 100755
--- a/configure
+++ b/configure
@@ -1012,9 +1012,8 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
-# gcc stupidly only outputs the basename of targets with -MM, but we need the
-# full relative path for objects in subdirectories for non-recursive Make.
-DEPEND_CMD='$(CC) $(CFLAGS) -MM -MG -MT $@ $<'
+# gcc stupidly only outputs the basename of targets with -MM
+DEPEND_CMD='$(CC) $(CFLAGS) -MM -MG $< | sed -e "/^\#.*/d" -e "1s,^,$(@D)/," -e "s,\\([[:space:]]\\)\\(version\\.h\\),\\1\$$(BUILD_ROOT_REL)/\\2,"'
# find source path
source_path="`dirname \"$0\"`"