diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-10-18 09:34:49 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-10-18 09:34:49 +0000 |
| commit | 24743a767f732fcced0af9cbe18897777c8125c2 (patch) | |
| tree | 9b0a09b7ed03c036673acf41ddd2f6299b63c5ad /common.mak | |
| parent | 522e9cf4e00aa49d67c9d0f0213e8b21f6d345c9 (diff) | |
| download | ffmpeg-24743a767f732fcced0af9cbe18897777c8125c2.tar.gz | |
Rename LIB to LIBNAME for consistency.
Originally committed as revision 10774 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/common.mak b/common.mak index e93ded0564..823cc8ef59 100644 --- a/common.mak +++ b/common.mak @@ -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)) |