From fe371f5f132f0f13dbf790716d9f4582d7681758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= Date: Sat, 10 Aug 2024 15:37:41 +0900 Subject: [PATCH] =?UTF-8?q?Linux=E3=81=A8BSD:=20=E4=BB=8A=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=80=81=E9=9D=99=E7=9A=84=E3=83=AA=E3=83=B3=E3=82=AF?= =?UTF-8?q?=E3=81=8C=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=82=8A=E3=81=BE=E3=81=97=E3=81=9F=EF=BC=88=E5=8B=95?= =?UTF-8?q?=E7=9A=84=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=AB=E3=81=AF=E3=80=8C?= =?UTF-8?q?make=20LDFLAGS=3D-lc=E3=80=8D=E3=82=92=E3=81=94=E5=88=A9?= =?UTF-8?q?=E7=94=A8=E4=B8=8B=E3=81=95=E3=81=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + Makefile | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9dcc15..cb32cab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Kubuntu、Xubuntu、Lubuntuロゴの追加 * Arcoロゴの追加 * Linux: 「hostname」コマンドがなければ、「cat /etc/hostname」を実効する様に +* LinuxとBSD: 今から、静的リンクがデフォルトになりました(動的リンクには「make LDFLAGS=-lc」をご利用下さい) # 0.2.0 * Manjaroのロゴの追加 diff --git a/Makefile b/Makefile index 4513832..8ef15d2 100644 --- a/Makefile +++ b/Makefile @@ -44,18 +44,20 @@ CNFPREFIX = /boot/home/config/settings CC = cc FILES = main.c src/*.c src/logo/*.c -CFLAGS = -Wall -Wextra -O3 -I${PREFIX}/include -L${PREFIX}/lib -.if ${UNAME_S} == "NetBSD" -CFLAGS += -I/usr/pkg/include -L/usr/pkg/lib -I/usr/include -L/usr/lib -.endif +CFLAGS = -Wall -Wextra -O3 + +LDFLAGS = -static -lc +.if ${UNAME_S} == "Haiku" || ${UNAME_S} == "Darwin" || ${UNAME_S} == "SunOS"\ + || ${UNAME_S} == "Minix" LDFLAGS = -lc +.endif all: ${CC} ${CFLAGS} -o ${NAME} ${FILES} ${LDFLAGS} strip ${NAME} clean: - rm -f ${NAME} + rm -rf ${NAME} dist: mkdir -p ${NAME}-${VERSION} release/src @@ -69,9 +71,6 @@ man: sed "s/VERSION/${VERSION}/g" < ${NAME}.1 > release/man/${VERSION}/${NAME}.1 sed "s/VERSION/${VERSION}/g" < ${NAME}.conf.5 > release/man/${VERSION}/${NAME}.conf.5 -depend: - ${DEPS} - release: mkdir -p release/bin/${VERSION}/${OS}/${UNAME_M} ${CC} ${CFLAGS} -o release/bin/${VERSION}/${OS}/${UNAME_M}/${NAME} ${FILES}\ @@ -81,8 +80,8 @@ release: install: mkdir -p ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANPREFIX}/man1\ ${DESTDIR}${MANPREFIX}/man5 - cp -f ${NAME} ${DESTDIR}${PREFIX}/bin - cp -f ${NAME}.conf ${DESTDIR}${CNFPREFIX} + cp -rf ${NAME} ${DESTDIR}${PREFIX}/bin + cp -rf ${NAME}.conf ${DESTDIR}${CNFPREFIX} chmod 755 ${DESTDIR}${PREFIX}/bin/${NAME} sed "s/VERSION/${VERSION}/g" < ${NAME}.1 > ${DESTDIR}${MANPREFIX}/man1/${NAME}.1 chmod 644 ${DESTDIR}${MANPREFIX}/man1/${NAME}.1 @@ -91,8 +90,8 @@ install: chmod 644 ${DESTDIR}${MANPREFIX}/man5/${NAME}.conf.5 uninstall: - rm -f ${DESTDIR}${PREFIX}/bin/${NAME} - rm -rf ${DESTDIR}${PREFIX}/man/man1/${NAME}.1 - rm -rf ${DESTDIR}${PREFIX}/man/man5/${NAME}.conf.5 + rm -rf ${DESTDIR}${PREFIX}/bin/${NAME} + rm -rf ${DESTDIR}${MANPREFIX}/man1/${NAME}.1 + rm -rf ${DESTDIR}${MANPREFIX}/man5/${NAME}.conf.5 .PHONY: all clean dist man release install uninstall