diff options
author | Diego Biurrun <diego@biurrun.de> | 2016-12-20 14:27:19 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2016-12-22 12:30:54 +0100 |
commit | 92db5083077a8b0f8e1050507671b456fd155125 (patch) | |
tree | 142d95a9446bfeca63688f4751c8272615e5af8c /avbuild/library.mak | |
parent | edb434873238876790f6a17bb65490cc29a1d176 (diff) | |
download | ffmpeg-92db5083077a8b0f8e1050507671b456fd155125.tar.gz |
build: Generate pkg-config files from Make and not from configure
This moves work from the configure to the Make stage where it can
be parallelized and ensures that pkgconfig files are updated when
library versions change.
Bug-Id: 449
Diffstat (limited to 'avbuild/library.mak')
-rw-r--r-- | avbuild/library.mak | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/avbuild/library.mak b/avbuild/library.mak index 45152bebe8..e5f6d7d288 100644 --- a/avbuild/library.mak +++ b/avbuild/library.mak @@ -9,8 +9,8 @@ INCINSTDIR := $(INCDIR)/lib$(NAME) INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%) -all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) -all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME) +all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME) $(SUBDIR)lib$(NAME).pc +all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME) $(SUBDIR)lib$(NAME).pc LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS) $(LIBOBJS) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H @@ -35,6 +35,9 @@ $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR) $$(M) $$(SRC_PATH)/avbuild/libversion.sh $(NAME) $$< > $$@ +$(SUBDIR)lib$(NAME).pc: $(SUBDIR)version.h | $(SUBDIR) + $$(M) $$(SRC_PATH)/avbuild/pkgconfig_generate.sh $(NAME) "$(DESC)" + $(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS) $$(M)sed 's/MAJOR/$(lib$(NAME)_VERSION_MAJOR)/' $$< | $(VERSION_SCRIPT_POSTPROCESS_CMD) > $$@ |