RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename LIB to LIBNAME for consistency. 

Originally committed as revision 10774 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-10-18 09:34:49 +00:00
parent 522e9cf4e0
commit 24743a767f
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common.mak
View File

@ -19,9 +19,9 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
STATIC_OBJS := $(OBJS) $(STATIC_OBJS) STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
SHARED_OBJS := $(OBJS) $(SHARED_OBJS) SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
all: $(LIB) $(SLIBNAME) all: $(LIBNAME) $(SLIBNAME)
$(LIB): $(STATIC_OBJS) $(LIBNAME): $(STATIC_OBJS)
rm -f $@ rm -f $@
$(AR) rc $@ $^ $(EXTRAOBJS) $(AR) rc $@ $^ $(EXTRAOBJS)
$(RANLIB) $@ $(RANLIB) $@
@ -39,7 +39,7 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
%.o: %.S %.o: %.S
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
%: %.o $(LIB) %: %.o $(LIBNAME)
$(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
%.ho: %.h %.ho: %.h
@ -79,9 +79,9 @@ install-lib-shared: $(SLIBNAME)
$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME) $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME)
$(SLIB_INSTALL_EXTRA_CMD) $(SLIB_INSTALL_EXTRA_CMD)
install-lib-static: $(LIB) install-lib-static: $(LIBNAME)
install -d "$(LIBDIR)" install -d "$(LIBDIR)"
install -m 644 $(LIB) "$(LIBDIR)" install -m 644 $(LIBNAME) "$(LIBDIR)"
$(LIB_INSTALL_EXTRA_CMD) $(LIB_INSTALL_EXTRA_CMD)
install-headers: install-headers:
@ -97,7 +97,7 @@ uninstall-libs:
"$(SHLIBDIR)/$(SLIBNAME)" \ "$(SHLIBDIR)/$(SLIBNAME)" \
"$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)" "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
-$(SLIB_UNINSTALL_EXTRA_CMD) -$(SLIB_UNINSTALL_EXTRA_CMD)
-rm -f "$(LIBDIR)/$(LIB)" -rm -f "$(LIBDIR)/$(LIBNAME)"
uninstall-headers:: uninstall-headers::
rm -f $(addprefix "$(INCDIR)/",$(HEADERS)) rm -f $(addprefix "$(INCDIR)/",$(HEADERS))

8
configure vendored
View File

@ -894,13 +894,13 @@ FFSERVERLDFLAGS=-Wl,-E
LDCONFIG="ldconfig" LDCONFIG="ldconfig"
LIBPREF="lib" LIBPREF="lib"
LIBSUF=".a" LIBSUF=".a"
LIB='$(LIBPREF)$(NAME)$(LIBSUF)' LIBNAME='$(LIBPREF)$(NAME)$(LIBSUF)'
SLIBPREF="lib" SLIBPREF="lib"
SLIBSUF=".so" SLIBSUF=".so"
SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)' SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)' SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)' SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIB)"' LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
# find source path # find source path
source_path="`dirname \"$0\"`" source_path="`dirname \"$0\"`"
@ -1247,7 +1247,7 @@ EOF
fi fi
if disabled static; then if disabled static; then
LIB="" LIBNAME=""
fi fi
if ! enabled libogg; then if ! enabled libogg; then
@ -1865,7 +1865,7 @@ echo "BUILD_STATIC=$static" >> config.mak
echo "BUILDSUF=$BUILDSUF" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak
echo "LIBPREF=$LIBPREF" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak
echo "LIBSUF=\$(BUILDSUF)$LIBSUF" >> config.mak echo "LIBSUF=\$(BUILDSUF)$LIBSUF" >> config.mak
echo "LIB=$LIB" >> config.mak echo "LIBNAME=$LIBNAME" >> config.mak
echo "SLIBPREF=$SLIBPREF" >> config.mak echo "SLIBPREF=$SLIBPREF" >> config.mak
echo "SLIBSUF=\$(BUILDSUF)$SLIBSUF" >> config.mak echo "SLIBSUF=\$(BUILDSUF)$SLIBSUF" >> config.mak
echo "EXESUF=\$(BUILDSUF)$EXESUF" >> config.mak echo "EXESUF=\$(BUILDSUF)$EXESUF" >> config.mak

10
libavcodec/Makefile
View File

@ -465,18 +465,18 @@ endif
tests: apiexample $(TESTS) tests: apiexample $(TESTS)
apiexample: apiexample.o $(LIB) apiexample: apiexample.o $(LIBNAME)
cpuid-test: i386/cputest.c cpuid-test: i386/cputest.c
$(CC) $(CFLAGS) -DTEST -o $@ $< $(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) $(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
motion-test: motion-test.o $(LIB) motion-test: motion-test.o $(LIBNAME)
.PHONY: tests .PHONY: tests