forked from latticeware/Cytoplasm
main() is already included in the library.
The runtime stub doesn't need to be a separate object.
This commit is contained in:
parent
2714a822b0
commit
2ea041d99d
1 changed files with 4 additions and 13 deletions
17
configure
vendored
17
configure
vendored
|
@ -18,7 +18,7 @@ LIBS="-lm -pthread"
|
||||||
|
|
||||||
|
|
||||||
# Set default args for all platforms
|
# Set default args for all platforms
|
||||||
SCRIPT_ARGS="--lib-rtstub=RtStub --prefix=/usr/local --enable-ld-extra --lib-name=Cytoplasm --lib-version=0.4.0 --static $@"
|
SCRIPT_ARGS="--prefix=/usr/local --enable-ld-extra --lib-name=Cytoplasm --lib-version=0.4.0 --static $@"
|
||||||
|
|
||||||
# Set platform specific args
|
# Set platform specific args
|
||||||
case "$(uname)" in
|
case "$(uname)" in
|
||||||
|
@ -74,9 +74,6 @@ for arg in $SCRIPT_ARGS; do
|
||||||
--disable-debug)
|
--disable-debug)
|
||||||
DEBUG=""
|
DEBUG=""
|
||||||
;;
|
;;
|
||||||
--lib-rtstub=*)
|
|
||||||
STUB=$(echo "$arg" | cut -d '=' -f 2-)
|
|
||||||
;;
|
|
||||||
--static)
|
--static)
|
||||||
STATIC="-static -Wl,-static"
|
STATIC="-static -Wl,-static"
|
||||||
;;
|
;;
|
||||||
|
@ -141,9 +138,9 @@ compile_bin() {
|
||||||
src="$1"
|
src="$1"
|
||||||
out="$2"
|
out="$2"
|
||||||
|
|
||||||
echo "${out}: ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so ${OUT}/lib/${LIB_NAME}.o ${src}"
|
echo "${out}: ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so ${src}"
|
||||||
echo "${TAB}@mkdir -p ${OUT}/bin"
|
echo "${TAB}@mkdir -p ${OUT}/bin"
|
||||||
echo "${TAB}\$(CC) \$(CFLAGS) -o \"${out}\" \"${src}\" ${OUT}/lib/${LIB_NAME}.o -L${OUT}/lib \$(LDFLAGS) -l${LIB_NAME} ${STATIC}"
|
echo "${TAB}\$(CC) \$(CFLAGS) -o \"${out}\" \"${src}\" -L${OUT}/lib \$(LDFLAGS) -l${LIB_NAME} ${STATIC}"
|
||||||
}
|
}
|
||||||
|
|
||||||
compile_doc() {
|
compile_doc() {
|
||||||
|
@ -220,10 +217,9 @@ ${TAB} diff -u -p - "LICENSE.txt" | \\
|
||||||
${TAB} patch "\$\$src" | grep -v "^Hmm"; \\
|
${TAB} patch "\$\$src" | grep -v "^Hmm"; \\
|
||||||
${TAB}done
|
${TAB}done
|
||||||
|
|
||||||
${LIB_NAME}: ${OUT}/lib/${LIB_NAME}.o ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so
|
${LIB_NAME}: ${OUT}/lib/lib${LIB_NAME}.a ${OUT}/lib/lib${LIB_NAME}.so
|
||||||
|
|
||||||
install: ${LIB_NAME}
|
install: ${LIB_NAME}
|
||||||
${TAB}install -D ${OUT}/lib/${LIB_NAME}.o \$(PREFIX)/lib/${LIB_NAME}.o
|
|
||||||
${TAB}install -D ${OUT}/lib/lib${LIB_NAME}.a \$(PREFIX)/lib/lib${LIB_NAME}.a
|
${TAB}install -D ${OUT}/lib/lib${LIB_NAME}.a \$(PREFIX)/lib/lib${LIB_NAME}.a
|
||||||
${TAB}install -D ${OUT}/lib/lib${LIB_NAME}.so \$(PREFIX)/lib/lib${LIB_NAME}.so
|
${TAB}install -D ${OUT}/lib/lib${LIB_NAME}.so \$(PREFIX)/lib/lib${LIB_NAME}.so
|
||||||
$(collect ${INCLUDE}/ '' '' \$\(PREFIX\)/include/${LIB_NAME}/ install_out)
|
$(collect ${INCLUDE}/ '' '' \$\(PREFIX\)/include/${LIB_NAME}/ install_out)
|
||||||
|
@ -231,7 +227,6 @@ $(collect ${INCLUDE}/ .h .3 \$\(PREFIX\)/man/man3/${LIB_NAME}- install_man)
|
||||||
$(collect ${TOOLS}/ '.c' '' \$\(PREFIX\)/bin/ install_tool)
|
$(collect ${TOOLS}/ '.c' '' \$\(PREFIX\)/bin/ install_tool)
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
${TAB}rm -r \$(PREFIX)/lib/${LIB_NAME}.*
|
|
||||||
${TAB}rm -r \$(PREFIX)/lib/lib${LIB_NAME}.*
|
${TAB}rm -r \$(PREFIX)/lib/lib${LIB_NAME}.*
|
||||||
${TAB}rm -r \$(PREFIX)/include/${LIB_NAME}
|
${TAB}rm -r \$(PREFIX)/include/${LIB_NAME}
|
||||||
${TAB}rm -r \$(PREFIX)/man/man3/${LIB_NAME}-*
|
${TAB}rm -r \$(PREFIX)/man/man3/${LIB_NAME}-*
|
||||||
|
@ -240,10 +235,6 @@ $(collect ${TOOLS}/ '.c' '' \$\(PREFIX\)/bin/ uninstall_out)
|
||||||
clean:
|
clean:
|
||||||
${TAB}rm -r "${BUILD}" "${OUT}"
|
${TAB}rm -r "${BUILD}" "${OUT}"
|
||||||
|
|
||||||
${OUT}/lib/${LIB_NAME}.o: ${BUILD}/${STUB}.o
|
|
||||||
${TAB}@mkdir -p ${OUT}/lib
|
|
||||||
${TAB}cp ${BUILD}/${STUB}.o ${OUT}/lib/${LIB_NAME}.o
|
|
||||||
|
|
||||||
${OUT}/lib/lib${LIB_NAME}.a: ${OBJS}
|
${OUT}/lib/lib${LIB_NAME}.a: ${OBJS}
|
||||||
${TAB}@mkdir -p ${OUT}/lib
|
${TAB}@mkdir -p ${OUT}/lib
|
||||||
${TAB}\$(AR) rcs ${OUT}/lib/lib${LIB_NAME}.a ${OBJS}
|
${TAB}\$(AR) rcs ${OUT}/lib/lib${LIB_NAME}.a ${OBJS}
|
||||||
|
|
Loading…
Reference in a new issue