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

defs.mk, make.mk, create-pkg-config.sh: Some additions to package-config creation

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-24 16:19:02 +00:00
commit 342ec62622
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
make/defs.mk
View file

@ -147,6 +147,7 @@ endif
FULL_NAME = $(shell id -nu | xargs getent passwd | cut -d: -f5) FULL_NAME = $(shell id -nu | xargs getent passwd | cut -d: -f5)
DEVELOPMENT ?= $(shell echo $(VERSION) | grep -q 'dev' && echo true) DEVELOPMENT ?= $(shell echo $(VERSION) | grep -q 'dev' && echo true)
USE_PROJECT_LIB ?= true USE_PROJECT_LIB ?= true
EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB)
USE_YTOOLS ?= true USE_YTOOLS ?= true
USE_EXCEPTIONS_IN_C ?= true USE_EXCEPTIONS_IN_C ?= true
REENTRANT ?= true REENTRANT ?= true

5
make/make.mk
View file

@ -38,8 +38,9 @@ install-links:
do-install-links: do-install-links:
@$(call install_links,MAKE) @$(call install_links,MAKE)
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(EXPORT_PROJECT_LIB),true)
CREATE_PKG_CONFIG_OPTS += -V blah=blub CREATE_PKG_CONFIG_OPTS += -c "-I$(PROJECT_DIRPATH)/include"
CREATE_PKG_CONFIG_OPTS += -l "-l$(PROJECT)"
endif endif
$(LOCAL_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

17
scripts/create-pkg-config.sh
View file

@ -29,7 +29,7 @@ set -e
project_descr_file="$1" project_descr_file="$1"
myname=`basename $0` myname=`basename $0`
eval set -- `getopt -- hF:d:n:s:p:v:V: "$@"` eval set -- `getopt -- hF:d:n:s:p:v:c:l:V: "$@"`
while [ "$1" != -- ]; do while [ "$1" != -- ]; do
case $1 in case $1 in
@ -59,6 +59,14 @@ case $1 in
version="$2" version="$2"
shift shift
;; ;;
-c)
cflags="$2"
shift
;;
-l)
libflags="$2"
shift
;;
-V) -V)
variables="$variables$2\n" variables="$variables$2\n"
shift shift
@ -77,6 +85,7 @@ shift
} }
[ "$variables" ] && echo -e "$variables" [ "$variables" ] && echo -e "$variables"
cat <<-EOT cat <<-EOT
prefix=$prefix prefix=$prefix
exec_prefix=\${prefix} exec_prefix=\${prefix}
@ -86,7 +95,9 @@ libdir=\${exec_prefix}/lib
Name: $name Name: $name
Description: $summary Description: $summary
Version: $version Version: $version
Cflags: -I\${includedir}/foo
Libs: -L\${libdir} -lfoo
EOT EOT
[ "$cflags" ] && echo "Cflags: $cflags"
[ "$libflags" ] && echo "Libs: $libflags"
exit 0