fix(Makefile): -lLIB = -l:libbase.so / .a
This commit is contained in:
7
Makefile
7
Makefile
@ -37,6 +37,9 @@ endif
|
|||||||
|
|
||||||
ifneq (${SHARED}, false)
|
ifneq (${SHARED}, false)
|
||||||
CFLAGS += -Xlinker -rpath=${LIBDIR}
|
CFLAGS += -Xlinker -rpath=${LIBDIR}
|
||||||
|
-lLIB = -l:lib${LIB}${-g}.so
|
||||||
|
else
|
||||||
|
-lLIB = -l:lib${LIB}${-g}.a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SRCDIR = src
|
SRCDIR = src
|
||||||
@ -100,7 +103,7 @@ ifneq (${TOOLS},)
|
|||||||
tools: library ${DIRS} ${patsubst %, ${BINDIR}/%${-g}, ${TOOLS}}
|
tools: library ${DIRS} ${patsubst %, ${BINDIR}/%${-g}, ${TOOLS}}
|
||||||
|
|
||||||
${BINDIR}/%${-g}: ${SRCDIR}/%.cpp ${patsubst %, ${OBJDIR}/%${-g}.o, ${OBJS}}
|
${BINDIR}/%${-g}: ${SRCDIR}/%.cpp ${patsubst %, ${OBJDIR}/%${-g}.o, ${OBJS}}
|
||||||
${CC} -o $@ $< -I${INCDIR} -L${LIBDIR} ${-l} -l${LIB}${-g} ${CFLAGS}
|
${CC} -o $@ $< -I${INCDIR} -L${LIBDIR} ${-l} ${-lLIB} ${CFLAGS}
|
||||||
|
|
||||||
${USRBIN}/%${-g}: ${BINDIR}/%${-g}
|
${USRBIN}/%${-g}: ${BINDIR}/%${-g}
|
||||||
install -Dm755 $< $@
|
install -Dm755 $< $@
|
||||||
@ -112,7 +115,7 @@ tests: library ${DIRS} ${patsubst %, ${BINDIR}/%${-g}, ${TESTS}}
|
|||||||
${patsubst %, ./${BINDIR}/%${-g};, ${TESTS}}
|
${patsubst %, ./${BINDIR}/%${-g};, ${TESTS}}
|
||||||
|
|
||||||
${BINDIR}/%${-g}: ${TESTDIR}/%.cpp ${patsubst %, ${OBJDIR}/%${-g}.o, ${OBJS}}
|
${BINDIR}/%${-g}: ${TESTDIR}/%.cpp ${patsubst %, ${OBJDIR}/%${-g}.o, ${OBJS}}
|
||||||
${CC} -o $@ $< -I${INCDIR} -L${LIBDIR} ${-l} -l${LIB}${-g} -lgtest ${CFLAGS}
|
${CC} -o $@ $< -I${INCDIR} -L${LIBDIR} ${-l} ${-lLIB} -lgtest ${CFLAGS}
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user