also add an unsuffixed symlink, fixes #1710

This commit is contained in:
Rudolf Polzer 2013-07-06 18:54:44 +02:00
parent 1dc200b9e0
commit e63a12c418

View File

@ -37,6 +37,8 @@ CAT ?= cat
MKDIR ?= mkdir -p MKDIR ?= mkdir -p
CP ?= cp CP ?= cp
CP_R ?= $(CP) -r CP_R ?= $(CP) -r
LN ?= ln
LN_SNF ?= $(LN) -snf
RM ?= rm RM ?= rm
RM_R ?= $(RM) -r RM_R ?= $(RM) -r
TEE_STDERR ?= | tee /dev/stderr TEE_STDERR ?= | tee /dev/stderr
@ -167,12 +169,15 @@ endif
INSTALLDIR_BASE := $(INSTALLDIR) INSTALLDIR_BASE := $(INSTALLDIR)
MAKE_EXE_SYMLINK = false
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
CFLAGS_COMMON += -fPIC CFLAGS_COMMON += -fPIC
LDFLAGS_DLL = -fPIC -ldl LDFLAGS_DLL = -fPIC -ldl
LIBS_COMMON = -lpthread LIBS_COMMON = -lpthread
EXE ?= $(shell uname -m) EXE ?= $(shell uname -m)
MAKE_EXE_SYMLINK = true
A = a A = a
DLL = so DLL = so
MWINDOWS = MWINDOWS =
@ -204,7 +209,8 @@ ifeq ($(OS),Darwin)
CPPFLAGS_COMMON += -I$(MACLIBDIR)/../include -I/usr/X11R6/include CPPFLAGS_COMMON += -I$(MACLIBDIR)/../include -I/usr/X11R6/include
LDFLAGS_COMMON += -L$(MACLIBDIR) -L/usr/X11R6/lib LDFLAGS_COMMON += -L$(MACLIBDIR) -L/usr/X11R6/lib
LDFLAGS_DLL += -dynamiclib -ldl LDFLAGS_DLL += -dynamiclib -ldl
EXE ?= ppc EXE ?= $(shell uname -m)
MAKE_EXE_SYMLINK = true
A = a A = a
DLL = dylib DLL = dylib
MWINDOWS = MWINDOWS =
@ -433,6 +439,7 @@ clean:
file=$@; $(MKDIR) $${file%/*} file=$@; $(MKDIR) $${file%/*}
$(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -o $@ $(CXX) $^ $(LDFLAGS) $(LDFLAGS_COMMON) $(LDFLAGS_EXTRA) $(LIBS_EXTRA) $(LIBS_COMMON) $(LIBS) -o $@
[ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; } [ -z "$(LDD)" ] || [ -z "`$(LDD) -r $@ $(STDERR_TO_STDOUT) $(STDOUT_TO_DEVNULL) $(TEE_STDERR)`" ] || { $(RM) $@; exit 1; }
if $(MAKE_EXE_SYMLINK); then o=$@; $(LN_SNF) $${o##*/} $*; fi
%.$(A): %.$(A):
$(AR) rc $@ $^ $(AR) rc $@ $^