fix(Makefile): .so was moved to ${LIBDIR}

This commit is contained in:
2024-09-18 10:42:35 +03:00
parent 871c850cbe
commit 2277ec01f3

View File

@ -36,7 +36,7 @@ CFLAGS += -O3
endif endif
ifneq (${SHARED}, false) ifneq (${SHARED}, false)
CFLAGS += -Xlinker -rpath=${BINDIR} CFLAGS += -Xlinker -rpath=${LIBDIR}
endif endif
SRCDIR = src SRCDIR = src
@ -59,14 +59,12 @@ build: library tools
i: install i: install
install: build\ install: build\
${USRLIB}/lib${LIB}${-g}.a\ ${patsubst %, ${USRLIB}/lib${LIB}${-g}%, .so .a}\
${USRLIB}/lib${LIB}${-g}.so\
${patsubst %, ${USRBIN}/%${-g}, ${TOOLS}} ${patsubst %, ${USRBIN}/%${-g}, ${TOOLS}}
uni: uninstall uni: uninstall
uninstall: uninstall:
rm -f ${USRLIB}/lib${LIB}${-g}.a rm -f ${patsubst %, ${USRLIB}/lib${LIB}${-g}%, .so .a}
rm -f ${USRLIB}/lib${LIB}${-g}.so
rm -f ${patsubst %, ${USRBIN}/%${-g}, ${TOOLS}} rm -f ${patsubst %, ${USRBIN}/%${-g}, ${TOOLS}}
clean: clean:
@ -74,21 +72,18 @@ clean:
ifneq (${OBJS},) ifneq (${OBJS},)
library: ${DIRS} ${LIBDIR}/lib${LIB}${-g}.a ${BINDIR}/lib${LIB}${-g}.so library: ${DIRS} ${patsubst %, ${LIBDIR}/lib${LIB}${-g}%, .so .a}
${OBJDIR}/%${-g}.o: ${SRCDIR}/%.cpp ${INCDIR}/${LIB}/%.hpp ${OBJDIR}/%${-g}.o: ${SRCDIR}/%.cpp ${INCDIR}/${LIB}/%.hpp
${CC} -o $@ -c $< -I${INCDIR} ${-l} ${CFLAGS} ${CC} -o $@ -c $< -I${INCDIR} ${-l} ${CFLAGS}
${BINDIR}/lib${LIB}${-g}.so: ${patsubst %, ${OBJDIR}/%${-g}.o, ${OBJS}} ${LIBDIR}/lib${LIB}${-g}.so: ${patsubst %, ${OBJDIR}/%${-g}.o, ${OBJS}}
${CC} -shared -o $@ $^ ${CC} -shared -o $@ $^
${LIBDIR}/lib${LIB}${-g}.a: ${patsubst %, ${OBJDIR}/%${-g}.o, ${OBJS}} ${LIBDIR}/lib${LIB}${-g}.a: ${patsubst %, ${OBJDIR}/%${-g}.o, ${OBJS}}
ar rcs $@ $^ ar rcs $@ $^
${USRLIB}/lib${LIB}${-g}.so: ${BINDIR}/lib${LIB}${-g}.so ${USRLIB}/lib${LIB}${-g}%: ${LIBDIR}/lib${LIB}${-g}%
cp $< $@
${USRLIB}/lib${LIB}${-g}.a: ${LIBDIR}/lib${LIB}${-g}.a
cp $< $@ cp $< $@
endif endif
@ -97,11 +92,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}}
ifneq (${SHARED}, false) ${CC} -o $@ $< -I${INCDIR} -L${LIBDIR} ${-l} -l${LIB}${-g} ${CFLAGS}
${CC} -o $@ $< -I${INCDIR} -L${BINDIR} ${-l} -l:lib${LIB}${-g}.so ${CFLAGS}
else
${CC} -o $@ $< -I${INCDIR} -L${LIBDIR} ${-l} -l:lib${LIB}${-g}.a ${CFLAGS}
endif
${USRBIN}/%${-g}: ${BINDIR}/%${-g} ${USRBIN}/%${-g}: ${BINDIR}/%${-g}
cp $< $@ cp $< $@
@ -113,11 +104,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}}
ifneq (${SHARED}, false) ${CC} -o $@ $< -I${INCDIR} -L${LIBDIR} ${-l} -l${LIB}${-g} -lgtest ${CFLAGS}
${CC} -o $@ $< -I${INCDIR} -L${BINDIR} ${-l} -l:lib${LIB}${-g}.so -lgtest ${CFLAGS}
else
${CC} -o $@ $< -I${INCDIR} -L${LIBDIR} ${-l} -l:lib${LIB}${-g}.a -lgtest ${CFLAGS}
endif
endif endif