janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 21:57:38 +01:00
Code Activity

make, scripts: Integrate pkg-config into build

Browse source 
First attempt on integrating pkg-config in package build process.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-23 11:19:43 +00:00
commit e26fbeb0f7
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/defs.mk
View file

@ -554,7 +554,7 @@ endif
# -- CRONTAB # -- CRONTAB
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += CRONTAB INSTALLATION_FILE_TYPES += CRONTAB
CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab)) CRONTAB += $(filter-out $(DONT_INSTALL),$(wildcard *.crontab))
BUILD_CRONTABDIR = $(TOPDIR)/cron.d BUILD_CRONTABDIR = $(TOPDIR)/cron.d
INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB)) INSTALLED_CRONTAB = $(addprefix $(INSTALL_CRONTABDIR)/,$(CRONTAB))
endif endif
@ -562,7 +562,7 @@ endif
# -- PKG_CONFIG # -- PKG_CONFIG
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
INSTALLATION_FILE_TYPES += PKG_CONFIG INSTALLATION_FILE_TYPES += PKG_CONFIG
PKG_CONFIG += $(filter-out $(DONT_INSTALL),$(wildcard *.pc)) PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG)))
BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig
INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG)) INSTALLED_PKG_CONFIG = $(addprefix $(INSTALL_PKG_CONFIGDIR)/,$(PKG_CONFIG))
endif endif

11
make/make.mk
View file

@ -6,7 +6,8 @@
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
BUILD_PKG_CONFIG = $(PROJECT).pc LOCAL_PKG_CONFIG = $(PROJECT).pc
BUILD_PKG_CONFIG = $(MODDIR)/pkgconfig/$(LOCAL_PKG_CONFIG)
INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(MODDIR)/make/deps.d
ifneq ($(wildcard pckg-deps.mk),) ifneq ($(wildcard pckg-deps.mk),)
@ -19,7 +20,7 @@ INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk
endif endif
all: $(BUILD_PKG_CONFIG) all: $(BUILD_PKG_CONFIG)
install: install_MAKE $(INSTALLED_PKG_MK) install: install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG
clean: textclean localclean doneclean clean.pkg-config clean: textclean localclean doneclean clean.pkg-config
test: test:
@ -37,14 +38,16 @@ install-links:
do-install-links: do-install-links:
@$(call install_links,MAKE) @$(call install_links,MAKE)
$(BUILD_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(MODDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh
/bin/bash $(MOD_SCRIPT_DIR)/create-pkg-config.sh \ /bin/bash $(MOD_SCRIPT_DIR)/create-pkg-config.sh \
-d "$(PROJECT_DESCR)" \ -d "$(PROJECT_DESCR)" \
-F $< \ -F $< \
> $@.tmp > $@.tmp
mv $@.tmp $@ mv $@.tmp $@
#$(BUILD_PKG_CONFIG): $(LOCAL_PKG_CONFIG)
clean.pkg-config: clean.pkg-config:
rm -f *.pc rm -f *.pc $(BUILD_PKG_CONFIG)

2
scripts/pkg.sh
View file

@ -799,7 +799,7 @@ cmd_milk_install_log()
in=$1 in=$1
out=$2 out=$2
local filter_devel='/include/.*.h$\|devel\|make\|lib.*\.a$\|lib.*\.so$\|.*\.exp$\|.*\.def$\|.*\.lib$' local filter_devel='/include/.*.h$\|devel\|make\|lib.*\.a$\|lib.*\.so$\|.*\.exp$\|.*\.def$\|.*\.lib$\|\.pc$'
# TODO: simplify this # TODO: simplify this
case $type in case $type in