diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | compat.h | 6 | ||||
| -rw-r--r-- | config.mk | 7 | ||||
| -rw-r--r-- | util.h | 5 |
4 files changed, 7 insertions, 17 deletions
@@ -12,8 +12,7 @@ SRC = \ sfeed_web.c\ sfeed_xmlenc.c\ util.c\ - xml.c -COMPATSRC = \ + xml.c\ strlcat.c\ strlcpy.c BIN = \ @@ -48,11 +47,10 @@ DOC = \ README.xml\ TODO HDR = \ - compat.h\ util.h\ xml.h -OBJ = ${SRC:.c=.o} ${EXTRAOBJ} +OBJ = ${SRC:.c=.o} all: $(BIN) diff --git a/compat.h b/compat.h deleted file mode 100644 index 0947de6..0000000 --- a/compat.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifdef COMPAT -#undef strlcat -size_t strlcat(char *, const char *, size_t); -#undef strlcpy -size_t strlcpy(char *, const char *, size_t); -#endif @@ -2,7 +2,7 @@ # paths PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man +MANPREFIX = ${PREFIX}/man # includes and libs LIBS = -lc @@ -22,10 +22,5 @@ LDFLAGS = -s ${LIBS} # -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_BSD_SOURCE #LDFLAGS = -static -s ${LIBS} -# uncomment for compat -CFLAGS += -DCOMPAT -# uncomment if your libc doesn't support strlcat, strlcpy and strtonum. -EXTRAOBJ = strlcat.o strlcpy.o - # compiler and linker #CC = cc @@ -1,4 +1,7 @@ -#include "compat.h" +#undef strlcat +size_t strlcat(char *, const char *, size_t); +#undef strlcpy +size_t strlcpy(char *, const char *, size_t); #define ISUTF8(c) (((c) & 0xc0) != 0x80) #define LEN(x) (sizeof (x) / sizeof *(x)) |