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: Introduced PI (PLUGIN) into standard build targets

Browse source
This commit is contained in:
Jan Lindemann 2007-08-23 14:26:06 +00:00 • committed by Jan Lindemann
commit a4b71dc727
4 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/defs-dev.mk
View file

@ -70,6 +70,12 @@ LIBMODE ?= $(EXEMODE)
LIBDIROWNER ?= $(EXEDIROWNER) LIBDIROWNER ?= $(EXEDIROWNER)
LIBDIRGROUP ?= $(EXEDIRGROUP) LIBDIRGROUP ?= $(EXEDIRGROUP)
LIBDIRMODE ?= $(EXEDIRMODE) LIBDIRMODE ?= $(EXEDIRMODE)
PIOWNER ?= $(LIBOWNER)
PIGROUP ?= $(LIBGROUP)
PIMODE ?= $(LIBMODE)
PIDIROWNER ?= $(LIBDIROWNER)
PIDIRGROUP ?= $(LIBDIRGROUP)
PIDIRMODE ?= $(LIBDIRMODE)
MAKEOWNER ?= $(HDROWNER) MAKEOWNER ?= $(HDROWNER)
MAKEGROUP ?= $(HDRGROUP) MAKEGROUP ?= $(HDRGROUP)
MAKEMODE ?= $(HDRMODE) MAKEMODE ?= $(HDRMODE)

10
make/defs.mk
View file

@ -166,7 +166,7 @@ UPLOAD_URL_RPM_SRC = rsync_ssh://ftp.jannet.de:/home/ftp/dat/pub/packages/rp
# -- standard dirs and files for build and install # -- standard dirs and files for build and install
INSTALLATION_FILE_TYPES= LIB HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG INSTALLATION_FILE_TYPES= LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG
# -- CFG # -- CFG
CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf CONFIG_FILE ?= $(CONFIG_DIR)/$(PROJECT).conf
@ -223,7 +223,13 @@ INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a)) INSTALLED_ALL_LIBS = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.a))
INSTALLED_LIB = $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \ INSTALLED_LIB = $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \
$(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS)) $(INSTALLED_LINKS_SO) $(sort $(INSTALLED_LIB_A) $(INSTALLED_ALL_LIBS))
BUILD_LIB += $(LIB_SO) $(addprefix $(BUILD_LIBDIR)/,$(PLUGIN)) BUILD_LIB += $(LIB_SO)
# -- PI
BUILD_PIDIR = $(BUILD_LIBDIR)
BUILD_PI = $(addprefix $(BUILD_PIDIR)/,$(PLUGIN))
INSTALL_PIDIR = $(INSTALL_LIBDIR)
INSTALLED_PI = $(addprefix $(INSTALL_PIDIR)/,$(PLUGIN))
# -- EXE # -- EXE
EXE_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*) EXE_ALL += $(EXE) $(wildcard *.a *.dll *.so *.so.*)

29
make/plugin-defs.mk
View file

@ -1,22 +1,21 @@
IS_PLUGIN = true IS_PLUGIN = true
PLUGIN_API ?= $(notdir $(shell cd ..; pwd))
PLUGIN_API ?= $(notdir $(shell cd ..; pwd)) PLUGIN_NAME ?= $(notdir $(shell pwd))
PLUGIN_NAME ?= $(notdir $(shell pwd)) PLUGIN_PREFIX ?= feedfs
PLUGIN_PREFIX ?= feedfs
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
PLUGIN_SUFFIX ?= so PLUGIN_SUFFIX ?= so
else else
PLUGIN_SUFFIX ?= dll PLUGIN_SUFFIX ?= dll
endif endif
PLUGIN ?= $(PLUGIN_PREFIX)_$(PLUGIN_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX) PLUGIN_VERSION_AND_API = $(PLUGIN_PREFIX)_$(PLUGIN_API)
PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_VERSION_AND_API)_version
PLUGIN ?= $(PLUGIN_VERSION_AND_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX)
PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX)_$(PLUGIN_API)_version PLUGIN_VERSION_LIB = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
PLUGIN_VERSION_LIB = $(BUILD_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
INSTALLED_PLUGIN_VERSION_LIB = $(INSTALL_LIBDIR)/lib$(PLUGIN_VERSION_LIB_BASENAME).a
CFLAGS += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" CFLAGS += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\"
CPPFLAGS += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\" CPPFLAGS += -D PLUGIN_NAME_STR=\"$(PLUGIN_NAME)\"
PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive
PROJECT_LDFLAGS += -Wl,--whole-archive -l$(PLUGIN_VERSION_LIB_BASENAME) -Wl,--no-whole-archive

4
make/plugin.mk
View file

@ -11,7 +11,7 @@ include $(MODDIR)/make/depend.mk
LOCAL_CPPFLAGS += -D_PLUGIN LOCAL_CPPFLAGS += -D_PLUGIN
LOCAL_CFLAGS += -D_PLUGIN LOCAL_CFLAGS += -D_PLUGIN
all: build_LIB all: build_PI
install: install_LIB install: install_PI
clean: execlean localclean clean: execlean localclean
distclean: clean distclean: clean