静的リンクはデフォルトに

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4d882ca97e236d3d8aefdcf8fbbe350d9c9d18c..3467a1355e41524c76f767375fdea95d3da89ebd 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 * Haiku対応
 * macOS対応
 * パスワードの検索の追加
+* 静的リンクはデフォルトに
 
 # 1.3.0
 * 英訳の追加 (レミリア・スカーレットさん)

diff --git a/Makefile b/Makefile
index 8ebd166a5ac51d38d9a16a435a2c4be95cf6700b..4e0f69cb91fc8365194bf2bf6fc755224f87ca6e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,27 +41,33 @@ DATAPREFIX = ${PREFIX}/data
 
 CC = cc
 FILES = main.c src/*.c
-CFLAGS = -Wall -Wextra -O3 -I${PREFIX}/include -L${PREFIX}/lib
+
+CFLAGS = -Wall -Wextra -I/usr/include -L/usr/lib
 .if ${UNAME_S} == "NetBSD"
-CFLAGS += -I/usr/pkg/include -L/usr/pkg/lib -I/usr/include -L/usr/lib
+CFLAGS += -I/usr/pkg/include -L/usr/pkg/lib -I/usr/local/include -L/usr/local/lib
+.elif ${UNAME_S} == "OpenBSD" || ${UNAME_S} == "FreeBSD"
+CFLAGS += -I/usr/local/include -L/usr/local/lib
 .endif
+
 LDFLAGS = -lgpgme -lcrypto
 
-SLDFLAGS = -static ${LDFLAGS}
 .if ${UNAME_S} == "OpenBSD"
-SLDFLAGS += -lc -lassuan -lgpg-error -lintl -liconv
+LDFLAGS += -lc -lassuan -lgpg-error -lintl -liconv
 .elif ${UNAME_S} == "FreeBSD"
-SLDFLAGS += -lc -lassuan -lgpg-error -lthr -lintl
+LDFLAGS += -lc -lassuan -lgpg-error -lthr -lintl
 .elif ${UNAME_S} == "NetBSD"
-SLDFLAGS += -lcrypt -lc -lassuan -lgpg-error -lintl
-.elif ${UNAME_S}
-SLDFLAGS += -lc -lassuan -lgpg-error
+LDFLAGS += -lcrypt -lc -lassuan -lgpg-error -lintl
+.elif ${UNAME_S} == "Linux"
+LDFLAGS += -lc -lassuan -lgpg-error
 .endif
 
 all:
-       ${CC} ${CFLAGS} -o ${NAME} ${FILES} ${LDFLAGS}
+       ${CC} -O3 ${CFLAGS} -o ${NAME} ${FILES} -static ${LDFLAGS}
        strip ${NAME}
 
+debug:
+       ${CC} -g ${CFLAGS} -o ${NAME} ${FILES} ${LDFLAGS}
+
 clean:
        rm -f ${NAME}
 
@@ -81,8 +87,8 @@ man:
 
 release:
        mkdir -p release/bin/${VERSION}/${OS}/${UNAME_M}
-       ${CC} ${CFLAGS} -o release/bin/${VERSION}/${OS}/${UNAME_M}/${NAME} ${FILES} \
-               ${SLDFLAGS}
+       ${CC} -O3 ${CFLAGS} -o release/bin/${VERSION}/${OS}/${UNAME_M}/${NAME} ${FILES} \
+               -static ${LDFLAGS}
        strip release/bin/${VERSION}/${OS}/${UNAME_M}/${NAME}
 
 install:

diff --git a/src/findpass.c b/src/findpass.c
index fdf0a7cfe72237c68a290459486fa2056f5e5438..69c56907cee8e7f8e05ad5bea353e6c5a37ba3ca 100644 (file)
--- a/src/findpass.c
+++ b/src/findpass.c
@@ -70,6 +70,8 @@ void scanDir(const char *dpath, const char *rpath, List *fpaths) {
       char *disname = strdup(rel);
       rmext(disname);
       addElement(&dispaths, disname);
+
+      free(disname);
     }
   }