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

lo.mk: Don't generate SO_PREFIX anylonger

Browse source 
- Clean up indentation

  - Don't generate SO_PREFIX anylonger, since that's incompatible
    with not having a .cpp file to parse when linking against
    ytools.rpm
This commit is contained in:
Jan Lindemann 2007-08-18 20:32:41 +00:00 • committed by Jan Lindemann
commit 4c2a0c721b
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
make/lo.mk
View file

@ -3,30 +3,33 @@ include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/depend.mk include $(MODDIR)/make/depend.mk
# === change this > # === change this >
TOOLS_DIR ?= $(TOPDIR)/tools TOOLS_DIR ?= $(TOPDIR)/tools
CPP_PREFIX ?= YLo CPP_PREFIX ?= YLo
SO_PREFIX = lo_ SO_PREFIX = lo_
#SO_PREFIX ?= \ #SO_PREFIX ?= \
# $(shell sed '/const char \*YAbstractLoadableObject::_soPrefix/ !d; s/[^"]*"//; s/".*//' \ # $(shell sed '/const char \*YAbstractLoadableObject::_soPrefix/ !d; s/[^"]*"//; s/".*//' \
# $(YTOOLS_DIR)/YLoadableObject/YAbstractLoadableObject.cpp) # $(YTOOLS_DIR)/YLoadableObject/YAbstractLoadableObject.cpp)
LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK
# === change this < # === change this <
.PRECIOUS: %.cpp .PRECIOUS: %.cpp
LOADABLE_OBJS = $(patsubst $(CPP_PREFIX)%,%,$(basename $(notdir $(wildcard $(TOOLS_DIR)/$(CPP_PREFIX)*.h)))) LOADABLE_OBJS = $(patsubst $(CPP_PREFIX)%,%,$(basename $(notdir $(wildcard $(TOOLS_DIR)/$(CPP_PREFIX)*.h))))
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOADABLE_OBJS))) LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOADABLE_OBJS)))
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 $(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)
clean: install: $(INSTALLED_LOADABLE_OBJ_LIBS)
clean: clean.lo
clean.lo:
rm -f *.o *.cpp *.so *.done *.dll rm -f *.o *.cpp *.so *.done *.dll
install: $(ALL) installso
$(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o
$(CPP) -shared $^ $(LDFLAGS) -o $@ $(CPP) -shared $^ $(LDFLAGS) -o $@