$(TOPDIR), make, scripts: Merged changes from V_1_1_31_6_POST_ACCEPTANCE

This commit is contained in:
Jan Lindemann 2011-05-15 18:28:19 +00:00 committed by Jan Lindemann
commit d1857e8d77
14 changed files with 251 additions and 60 deletions

View file

@ -6,7 +6,7 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
all: $(LD_CONF)
all:
ifeq ($(USE_PROJECT_LIB),false)
ifeq ($(TARGET),mingw)
SHOBJS += $(wildcard *.dll)
@ -14,9 +14,9 @@ ifeq ($(USE_PROJECT_LIB),false)
SHOBJS += $(wildcard *.so)
endif
all:
install: $(INSTALLED_SHOBJS) install_LD_CONF
install:
else
all: $(LIB_SO) $(LINKS_SO) $(MSVCPP_IMPLIB) $(STRIP_DONE)
all: $(LD_CONF) $(LIB_SO) $(LINKS_SO) $(MSVCPP_IMPLIB) $(STRIP_DONE)
install: install_LIB install_LD_CONF
endif
clean: libclean local_libclean clean.ld-conf