Rename LIB to LIBNAME for consistency.
authorDiego Biurrun <diego@biurrun.de>
Thu, 18 Oct 2007 09:34:49 +0000 (09:34 +0000)
committerDiego Biurrun <diego@biurrun.de>
Thu, 18 Oct 2007 09:34:49 +0000 (09:34 +0000)
Originally committed as revision 10774 to svn://svn.ffmpeg.org/ffmpeg/trunk

common.mak
configure
libavcodec/Makefile

index e93ded0..823cc8e 100644 (file)
@@ -19,9 +19,9 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
 SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
 
-all: $(LIB) $(SLIBNAME)
+all: $(LIBNAME) $(SLIBNAME)
 
-$(LIB): $(STATIC_OBJS)
+$(LIBNAME): $(STATIC_OBJS)
        rm -f $@
        $(AR) rc $@ $^ $(EXTRAOBJS)
        $(RANLIB) $@
@@ -39,7 +39,7 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
 %.o: %.S
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
 
-%: %.o $(LIB)
+%: %.o $(LIBNAME)
        $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
 
 %.ho: %.h
@@ -79,9 +79,9 @@ install-lib-shared: $(SLIBNAME)
                $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
        $(SLIB_INSTALL_EXTRA_CMD)
 
-install-lib-static: $(LIB)
+install-lib-static: $(LIBNAME)
        install -d "$(LIBDIR)"
-       install -m 644 $(LIB) "$(LIBDIR)"
+       install -m 644 $(LIBNAME) "$(LIBDIR)"
        $(LIB_INSTALL_EXTRA_CMD)
 
 install-headers:
@@ -97,7 +97,7 @@ uninstall-libs:
               "$(SHLIBDIR)/$(SLIBNAME)"            \
               "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
        -$(SLIB_UNINSTALL_EXTRA_CMD)
-       -rm -f "$(LIBDIR)/$(LIB)"
+       -rm -f "$(LIBDIR)/$(LIBNAME)"
 
 uninstall-headers::
        rm -f $(addprefix "$(INCDIR)/",$(HEADERS))
index 630b77a..6f4dfc6 100755 (executable)
--- a/configure
+++ b/configure
@@ -894,13 +894,13 @@ FFSERVERLDFLAGS=-Wl,-E
 LDCONFIG="ldconfig"
 LIBPREF="lib"
 LIBSUF=".a"
-LIB='$(LIBPREF)$(NAME)$(LIBSUF)'
+LIBNAME='$(LIBPREF)$(NAME)$(LIBSUF)'
 SLIBPREF="lib"
 SLIBSUF=".so"
 SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
 SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
 SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
-LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIB)"'
+LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
 
 # find source path
 source_path="`dirname \"$0\"`"
@@ -1247,7 +1247,7 @@ EOF
 fi
 
 if disabled static; then
-    LIB=""
+    LIBNAME=""
 fi
 
 if ! enabled libogg; then
@@ -1865,7 +1865,7 @@ echo "BUILD_STATIC=$static" >> config.mak
 echo "BUILDSUF=$BUILDSUF" >> config.mak
 echo "LIBPREF=$LIBPREF" >> config.mak
 echo "LIBSUF=\$(BUILDSUF)$LIBSUF" >> config.mak
-echo "LIB=$LIB" >> config.mak
+echo "LIBNAME=$LIBNAME" >> config.mak
 echo "SLIBPREF=$SLIBPREF" >> config.mak
 echo "SLIBSUF=\$(BUILDSUF)$SLIBSUF" >> config.mak
 echo "EXESUF=\$(BUILDSUF)$EXESUF" >> config.mak
index 0e936ab..5516bd1 100644 (file)
@@ -465,18 +465,18 @@ endif
 
 tests: apiexample $(TESTS)
 
-apiexample: apiexample.o $(LIB)
+apiexample: apiexample.o $(LIBNAME)
 
 cpuid-test: i386/cputest.c
        $(CC) $(CFLAGS) -DTEST -o $@ $<
 
-dct-test: dct-test.o fdctref.o $(LIB)
+dct-test: dct-test.o fdctref.o $(LIBNAME)
 
-fft-test: fft-test.o $(LIB)
+fft-test: fft-test.o $(LIBNAME)
 
-imgresample-test: imgresample.c $(LIB)
+imgresample-test: imgresample.c $(LIBNAME)
        $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
 
-motion-test: motion-test.o $(LIB)
+motion-test: motion-test.o $(LIBNAME)
 
 .PHONY: tests