mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
lo.mk: Don't generate SO_PREFIX anylonger
- 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:
parent
85ebee471b
commit
4c2a0c721b
1 changed files with 13 additions and 10 deletions
23
make/lo.mk
23
make/lo.mk
|
|
@ -3,30 +3,33 @@ include $(MODDIR)/make/rules.mk
|
|||
include $(MODDIR)/make/depend.mk
|
||||
|
||||
# === change this >
|
||||
TOOLS_DIR ?= $(TOPDIR)/tools
|
||||
TOOLS_DIR ?= $(TOPDIR)/tools
|
||||
|
||||
CPP_PREFIX ?= YLo
|
||||
SO_PREFIX = lo_
|
||||
CPP_PREFIX ?= YLo
|
||||
SO_PREFIX = lo_
|
||||
#SO_PREFIX ?= \
|
||||
# $(shell sed '/const char \*YAbstractLoadableObject::_soPrefix/ !d; s/[^"]*"//; s/".*//' \
|
||||
# $(YTOOLS_DIR)/YLoadableObject/YAbstractLoadableObject.cpp)
|
||||
LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK
|
||||
LOADABLE_OBJ_HOOK ?= LOADABLE_OBJECT_HOOK
|
||||
# === change this <
|
||||
|
||||
.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)
|
||||
LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOADABLE_OBJS)))
|
||||
LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .so, $(LOADABLE_OBJS)))
|
||||
else
|
||||
LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .dll, $(LOADABLE_OBJS)))
|
||||
LOADABLE_OBJ_LIBS = $(addprefix $(SO_PREFIX), $(addsuffix .dll, $(LOADABLE_OBJS)))
|
||||
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)
|
||||
clean:
|
||||
install: $(INSTALLED_LOADABLE_OBJ_LIBS)
|
||||
clean: clean.lo
|
||||
|
||||
clean.lo:
|
||||
rm -f *.o *.cpp *.so *.done *.dll
|
||||
install: $(ALL) installso
|
||||
|
||||
$(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o
|
||||
$(CPP) -shared $^ $(LDFLAGS) -o $@
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue