janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 06:40:39 +01:00
Code Activity

make: Renamed LIBDIR to BUILD_LIBDIR

Browse source
This commit is contained in:
Jan Lindemann 2007-08-21 16:20:19 +00:00 • committed by Jan Lindemann
commit 1924377731
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/header.mk
View file

@ -4,7 +4,7 @@
# $Id$ # $Id$
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
ALL += $(LIBDIR) $(PREREQ_DONE) $(BUILD_H) ALL += $(BUILD_LIBDIR) $(PREREQ_DONE) $(BUILD_HDR)
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
clean: objclean textclean localclean clean: objclean textclean localclean
install: $(ALL) install: $(ALL)

6
make/lo.mk
View file

@ -21,7 +21,7 @@ LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOA
else else
LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .dll, $(LOADABLE_OBJS))) LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .dll, $(LOADABLE_OBJS)))
endif endif
BUILD_LOADABLE_OBJ_LIBS = $(addprefix $(LIBDIR)/, $(LOADABLE_OBJ_LIBS)) BUILD_LOADABLE_OBJ_LIBS = $(addprefix $(BUILD_LIBDIR)/, $(LOADABLE_OBJ_LIBS))
INSTALLED_LOADABLE_OBJ_LIBS = $(addprefix $(INSTALL_LIBDIR)/, $(LOADABLE_OBJ_LIBS)) INSTALLED_LOADABLE_OBJ_LIBS = $(addprefix $(INSTALL_LIBDIR)/, $(LOADABLE_OBJ_LIBS))
all: $(LOADABLE_OBJ_LIBS) $(BUILD_LOADABLE_OBJ_LIBS) all: $(LOADABLE_OBJ_LIBS) $(BUILD_LOADABLE_OBJ_LIBS)
@ -37,7 +37,7 @@ $(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o
%.cpp: $(TOOLS_DIR)/$(CPP_PREFIX)%.h %.cpp: $(TOOLS_DIR)/$(CPP_PREFIX)%.h
echo -e "#include \"$<\"\n$(LOADABLE_OBJ_HOOK)($(CPP_PREFIX)$*);\n" > $@ echo -e "#include \"$<\"\n$(LOADABLE_OBJ_HOOK)($(CPP_PREFIX)$*);\n" > $@
$(LIBDIR)/%.so: %.so $(BUILD_LIBDIR)/%.so: %.so
install -m 755 $< $@ install -m 755 $< $@
$(LIBDIR)/%.dll: %.dll $(BUILD_LIBDIR)/%.dll: %.dll
install -m 755 $< $@ install -m 755 $< $@

2
make/plugin-defs.mk
View file

@ -12,7 +12,7 @@ endif
PLUGIN ?= $(PLUGIN_PREFIX)_$(PLUGIN_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX) PLUGIN ?= $(PLUGIN_PREFIX)_$(PLUGIN_API)_$(PLUGIN_NAME).$(PLUGIN_SUFFIX)
PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX)_$(PLUGIN_API)_version PLUGIN_VERSION_LIB_BASENAME = $(PLUGIN_PREFIX)_$(PLUGIN_API)_version
PLUGIN_VERSION_LIB = $(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)\"

4
make/so.mk
View file

@ -4,7 +4,7 @@
# $Id$ # $Id$
LDFLAGS += -shared LDFLAGS += -shared
BUILD_SHOBJS = $(addprefix $(LIBDIR)/, $(SHOBJS)) BUILD_SHOBJS = $(addprefix $(BUILD_LIBDIR)/, $(SHOBJS))
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/ldlibpath.mk include $(MODDIR)/make/ldlibpath.mk
@ -14,5 +14,5 @@ all: $(SHOBJS) $(BUILD_SHOBJS)
clean: objclean textclean localclean clean: objclean textclean localclean
install: $(ALL) installso install: $(ALL) installso
$(LIBDIR)/%.so: %.so $(BUILD_LIBDIR)/%.so: %.so
install -m 755 $< $@ install -m 755 $< $@