janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

make: Add LD_CONF support (automatically added to all projects in lib.mk)

Browse source
This commit is contained in:
Jan Lindemann 2008-04-09 11:20:01 +00:00 • committed by Jan Lindemann
commit 1ebb79d5d6
5 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
make/defs-dev.mk
View file

@ -12,6 +12,7 @@ EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(EXE_PREFIX)
SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
LD_CONF_DIR ?= $(ENV_PREFIX)/$(HOME)/etc/ld.so.conf.d
IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(PREFIX)/log
JAVA_PREFIX ?= $(PREFIX)
@ -135,6 +136,12 @@ JAVAMODE ?= $(LIBMODE)
JAVADIROWNER ?= $(LIBDIROWNER)
JAVADIRGROUP ?= $(LIBDIRGROUP)
JAVADIRMODE ?= $(LIBDIRMODE)
LD_CONFOWNER ?= $(CFGOWNER)
LD_CONFGROUP ?= $(CFGGROUP)
LD_CONFMODE ?= $(CFGMODE)
LD_CONFDIROWNER ?= $(CFGDIROWNER)
LD_CONFDIRGROUP ?= $(CFGDIROWNER)
LD_CONFDIRMODE ?= $(CFGDIRMODE)
# -- options

7
make/defs-dist.mk
View file

@ -12,6 +12,7 @@ EXE_PREFIX ?= $(PREFIX)
INIT_PREFIX ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
CONFIG_DIR ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
LD_CONF_DIR ?= $(ENV_PREFIX)/etc/ld.so.conf.d
IMG_PREFIX ?= $(PREFIX)
LOG_PREFIX ?= $(ENV_PREFIX)/var/log
JAVA_PREFIX ?= $(PREFIX)
@ -136,6 +137,12 @@ JAVAMODE ?= $(LIBMODE)
JAVADIROWNER ?= $(LIBDIROWNER)
JAVADIRGROUP ?= $(LIBDIRGROUP)
JAVADIRMODE ?= $(LIBDIRMODE)
LD_CONFOWNER ?= $(CFGOWNER)
LD_CONFGROUP ?= $(CFGGROUP)
LD_CONFMODE ?= $(CFGMODE)
LD_CONFDIROWNER ?= $(CFGDIROWNER)
LD_CONFDIRGROUP ?= $(CFGDIROWNER)
LD_CONFDIRMODE ?= $(CFGDIRMODE)
# -- options

5
make/defs.mk
View file

@ -322,6 +322,11 @@ JAVA_JARS ?= $(wildcard *.jar)
INSTALL_JAVADIR ?= $(JAVADIR)
INSTALLED_JAVA ?= $(addprefix $(INSTALL_JAVADIR)/,$(JAVA_JARS))
# -- LD_CONF
LD_CONF += ld-$(PROJECT).conf
INSTALL_LD_CONFDIR = $(LD_CONF_DIR)
INSTALLED_LD_CONF = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF))
# ==
ifeq ($(DEVELOPMENT),true)

13
make/lib.mk
View file

@ -6,9 +6,9 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
all: $(LIB_SO) $(LINKS_SO) $(MSVCPP_IMPLIB) $(STRIP_DONE)
install: install_LIB
clean: libclean local_libclean
all: $(LD_CONF) $(LIB_SO) $(LINKS_SO) $(MSVCPP_IMPLIB) $(STRIP_DONE)
install: install_LIB $(INSTALLED_LD_CONF)
clean: libclean local_libclean clean.ld-conf
distclean: clean
local_libclean: clean.mingw clean.unix clean.all
@ -25,3 +25,10 @@ endif
clean.all:
rm -rf *.a *.o *~ st* .*.swp *.done
ld-%.conf:
echo $(INSTALL_LIBDIR) > $@.tmp
mv $@.tmp $@
clean.ld-conf:
rm -f $(LD_CONF)

2
make/rules.mk
View file

@ -248,7 +248,7 @@ check_not_empty_$(1):
fi
endef
INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG IMG LOG JAVA
INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG IMG LOG JAVA LD_CONF
#$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\
# $(eval $(call std_install_rules,$(type)$(attr)))))