openkylin
/
make-it-quick
mirror of https://gitee.com/openkylin/make-it-quick.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Correctly generate pkg-config.mk when CONFIG=libX but no PKGCONFIGS

This commit is contained in:
Christophe de Dinechin 2017-11-30 10:49:57 +01:00
parent 9d72c7ebfc
commit 856fca299e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rules.mk
View File

@ -383,6 +383,7 @@ PKG_DEPS= $(MAKEFILE_DEPS) $(OBJDIR).mkdir
$(OBJDIR)pkg-config.mk: $(PKG_CFLAGS) $(PKG_LDFLAGS) $(PKG_LIBS)
$(PRINT_COMMAND) (echo CFLAGS_PKGCONFIG=`$(CAT) $(PKG_CFLAGS)`; echo LDFLAGS_PKGCONFIG=`$(CAT) $(PKG_LDFLAGS) $(PKG_LIBS)`) > $@
-include $(PKGCONFIGS:%=$(OBJDIR)pkg-config.mk)
-include $(PKG_LIBS:%=$(OBJDIR)pkg-config.mk)
$(OBJDIR)%?.pkg-config.cflags: $(PKG_DEPS)
$(PRINT_PKGCONFIG) (pkg-config --cflags $* --silence-errors || true) > $@
@ -404,7 +405,8 @@ $(OBJDIR)lib%.cfg.ldflags: $(OBJDIR)CFG_HAVE_lib%.h $(PKG_DEPS)
NORM_CONFIG=$(subst <,.lt.,$(subst >,.gt.,$(subst /,.sl.,$(CONFIG))))
ORIG_TARGET=$(subst .lt.,<,$(subst .gt.,>,$(subst .sl.,/,$*)))
CONFIG_DEPS= $(MAKEFILE_DEPS) $(OBJDIR).mkdir \
$(PKGCONFIGS:%=$(OBJDIR)pkg-config.mk)
$(PKGCONFIGS:%=$(OBJDIR)pkg-config.mk) \
$(PKG_LIBS:%=$(OBJDIR)pkg-config.mk)
config.h: $(NORM_CONFIG:%=$(OBJDIR)CFG_HAVE_%.h)
$(PRINT_GENERATE) cat $^ > $@