config.mk cleanup

diff --git a/arg.h b/arg.h
deleted file mode 100644 (file)
index 6c4a528..0000000
--- a/arg.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copy me if you can.
- * by 20h
- */
-
-#ifndef ARG_H__
-#define ARG_H__
-
-extern char *argv0;
-
-/* use main(int argc, char *argv[]) */
-#define ARGBEGIN       for (argv0 = *argv, argv++, argc--;\
-                                       argv[0] && argv[0][1]\
-                                       && argv[0][0] == '-';\
-                                       argc--, argv++) {\
-                               char argc_;\
-                               char **argv_;\
-                               int brk_;\
-                               if (argv[0][1] == '-' && argv[0][2] == '\0') {\
-                                       argv++;\
-                                       argc--;\
-                                       break;\
-                               }\
-                               for (brk_ = 0, argv[0]++, argv_ = argv;\
-                                               argv[0][0] && !brk_;\
-                                               argv[0]++) {\
-                                       if (argv_ != argv)\
-                                               break;\
-                                       argc_ = argv[0][0];\
-                                       switch (argc_)
-
-#define ARGEND                 }\
-                       }
-
-#define ARGC()         argc_
-
-#define ARGNUMF(base)  (brk_ = 1, estrtol(argv[0], (base)))
-
-#define EARGF(x)       ((argv[0][1] == '\0' && argv[1] == NULL)?\
-                               ((x), abort(), (char *)0) :\
-                               (brk_ = 1, (argv[0][1] != '\0')?\
-                                       (&argv[0][1]) :\
-                                       (argc--, argv++, argv[0])))
-
-#define ARGF()         ((argv[0][1] == '\0' && argv[1] == NULL)?\
-                               (char *)0 :\
-                               (brk_ = 1, (argv[0][1] != '\0')?\
-                                       (&argv[0][1]) :\
-                                       (argc--, argv++, argv[0])))
-
-#endif

diff --git a/concat.h b/concat.h
deleted file mode 100644 (file)
index 9f138d7..0000000
--- a/concat.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Thanks to lloyd for contribution
- */
-
-extern char concat[4096];
-
-extern void
-ccat(const unsigned short int count, ...)
-{
-       va_list ap;
-       unsigned short int i;
-       concat[0] = '\0';
-
-       va_start(ap, count);
-       for(i = 0; i < count; i++)
-               strlcat(concat, va_arg(ap, char *), sizeof(concat));
-       va_end(ap);
-       return;
-}

diff --git a/config.mk b/config.mk
index 8e404d683f26cde0795943d071002ecd2f97243b..704558a367c60de7ac5accbd52b6bac6e484f31c 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -3,9 +3,7 @@ VERSION = 1.0
 
 # Customize below to fit your system
 
-# paths
 PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
@@ -17,13 +15,7 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lasound
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\" -D_GNU_SOURCE
 CFLAGS = -std=c99 -pedantic -Wno-unused-function -Wall -Wextra -O0 ${INCS} ${CPPFLAGS}
-#CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = ${LIBS}
-#LDFLAGS = -s ${LIBS}
-
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
 
 # compiler and linker
 CC = cc