diff options
| -rw-r--r-- | common.mak | 6 | ||||
| -rw-r--r-- | libpostproc/Makefile | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/common.mak b/common.mak index 9030a6969f..babcd10329 100644 --- a/common.mak +++ b/common.mak @@ -16,12 +16,10 @@ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) -STATIC_OBJS := $(OBJS) $(STATIC_OBJS) -SHARED_OBJS := $(OBJS) $(SHARED_OBJS) all: $(LIBNAME) $(SLIBNAME) -$(LIBNAME): $(STATIC_OBJS) +$(LIBNAME): $(OBJS) rm -f $@ $(AR) rc $@ $^ $(EXTRAOBJS) $(RANLIB) $@ @@ -29,7 +27,7 @@ $(LIBNAME): $(STATIC_OBJS) $(SLIBNAME): $(SLIBNAME_WITH_MAJOR) $(LN_S) $^ $@ -$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS) +$(SLIBNAME_WITH_MAJOR): $(OBJS) $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) diff --git a/libpostproc/Makefile b/libpostproc/Makefile index 452c105d21..a39470be5a 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -10,13 +10,13 @@ NAME=postproc LIBVERSION=$(SPPVERSION) LIBMAJOR=$(SPPMAJOR) -STATIC_OBJS=postprocess.o -SHARED_OBJS=postprocess_pic.o - HEADERS = postprocess.h include ../common.mak +$(LIBNAME): postprocess.o +$(SLIBNAME_WITH_MAJOR): postprocess_pic.o + depend dep: postprocess.c postprocess_pic.o: postprocess.c |