moving conf header files to new location + rename s/conf/h/

39 files changed, 98 insertions, 78 deletions

diff --git a/Makefile b/Makefile
index 1b328a6..55af41d 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,9 @@
 
 -include src/autoconf.make
 
-confdir  := $(sysconfdir)/latrace.d
-confarch := $(sysconfdir)/latrace.d/sysdeps/$(CONFIG_SYSDEP_DIR)
+confdir     := $(sysconfdir)/latrace.d
+headdir     := $(sysconfdir)/latrace.d/headers
+headarchdir := $(sysconfdir)/latrace.d/headers/sysdeps/$(CONFIG_SYSDEP_DIR)
 
 # looks like DESTDIR is a standard, but prioritize ROOTDIR anyway
 ifdef DESTDIR
@@ -84,43 +85,43 @@ endef
 all::
 
 install:: all
-	$(call install,etc/latrace.conf,$(sysconfdir),644)
-	$(call install,etc/latrace.d/ctype.conf,$(confdir),644)
-	$(call install,etc/latrace.d/inet.conf,$(confdir),644)
-	$(call install,etc/latrace.d/misc.conf,$(confdir),644)
-	$(call install,etc/latrace.d/typedefs.conf,$(confdir),644)
-	$(call install,etc/latrace.d/stdlib.conf,$(confdir),644)
-	$(call install,etc/latrace.d/string.conf,$(confdir),644)
-	$(call install,etc/latrace.d/ctype.conf,$(confdir),644)
-	$(call install,etc/latrace.d/ncurses.conf,$(confdir),644)
-	$(call install,etc/latrace.d/stdio.conf,$(confdir),644)
-	$(call install,etc/latrace.d/dirent.conf,$(confdir),644)
-	$(call install,etc/latrace.d/unistd.conf,$(confdir),644)
-	$(call install,etc/latrace.d/libintl.conf,$(confdir),644)
-	$(call install,etc/latrace.d/dlfcn.conf,$(confdir),644)
-	$(call install,etc/latrace.d/fcntl.conf,$(confdir),644)
-	$(call install,etc/latrace.d/getopt.conf,$(confdir),644)
-	$(call install,etc/latrace.d/signal.conf,$(confdir),644)
-	$(call install,etc/latrace.d/ioctl.conf,$(confdir),644)
-	$(call install,etc/latrace.d/socket.conf,$(confdir),644)
-	$(call install,etc/latrace.d/netdb.conf,$(confdir),644)
-	$(call install,etc/latrace.d/stat.conf,$(confdir),644)
-	$(call install,etc/latrace.d/wait.conf,$(confdir),644)
-	$(call install,etc/latrace.d/utmp.conf,$(confdir),644)
-	$(call install,etc/latrace.d/time.conf,$(confdir),644)
-	$(call install,etc/latrace.d/termios.conf,$(confdir),644)
-	$(call install,etc/latrace.d/term.conf,$(confdir),644)
-	$(call install,etc/latrace.d/syslog.conf,$(confdir),644)
-	$(call install,etc/latrace.d/pwd.conf,$(confdir),644)
-	$(call install,etc/latrace.d/libio.conf,$(confdir),644)
-	$(call install,etc/latrace.d/locale.conf,$(confdir),644)
-	$(call install,etc/latrace.d/pthread.conf,$(confdir),644)
-	$(call install,etc/latrace.d/resource.conf,$(confdir),644)
-	$(call install,etc/latrace.d/mman.conf,$(confdir),644)
+	$(call install,etc/latrace.d/latrace.conf,$(confdir),644)
+	$(call install,etc/latrace.d/headers/ctype.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/inet.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/misc.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/typedefs.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/stdlib.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/string.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/ctype.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/ncurses.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/stdio.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/dirent.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/unistd.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/libintl.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/dlfcn.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/fcntl.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/getopt.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/signal.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/ioctl.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/socket.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/netdb.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/stat.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/wait.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/utmp.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/time.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/termios.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/term.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/syslog.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/pwd.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/libio.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/locale.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/pthread.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/resource.h,$(headdir),644)
+	$(call install,etc/latrace.d/headers/mman.h,$(headdir),644)
 ifeq ($(CONFIG_SYSDEP_DIR),x86_64)
 	@mkdir -p $(ROOTDIR)/$(confarch)
-	$(call install,etc/sysdeps/$(CONFIG_SYSDEP_DIR)/latrace.conf,$(confarch),644)
-	$(call install,etc/sysdeps/$(CONFIG_SYSDEP_DIR)/syscall.conf,$(confarch),644)
+	$(call install,etc/latrace.d/headers/sysdeps/$(CONFIG_SYSDEP_DIR)/latrace.h,$(headarchdir),644)
+	$(call install,etc/latrace.d/headers/sysdeps/$(CONFIG_SYSDEP_DIR)/syscall.h,$(headarchdir),644)
 endif
 
 
diff --git a/configure.ac b/configure.ac
index bf5e984..966f6bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,5 +100,6 @@ AC_SEARCH_LIBS([cplus_demangle], [iberty_pic iberty],
 AC_CONFIG_HEADER([src/autoconf.h])
 AC_CONFIG_FILES([src/autoconf.make])
 AC_CONFIG_FILES([doc/asciidoc.conf])
+AC_CONFIG_FILES([etc/latrace.d/latrace.conf])
 
 AC_OUTPUT
diff --git a/etc/latrace.d/ctype.conf b/etc/latrace.d/headers/ctype.h
index 1bc8baa..1bc8baa 100644
--- a/etc/latrace.d/ctype.conf
+++ b/etc/latrace.d/headers/ctype.h
diff --git a/etc/latrace.d/dirent.conf b/etc/latrace.d/headers/dirent.h
index 40262c3..40262c3 100644
--- a/etc/latrace.d/dirent.conf
+++ b/etc/latrace.d/headers/dirent.h
diff --git a/etc/latrace.d/dlfcn.conf b/etc/latrace.d/headers/dlfcn.h
index 82f8ec8..82f8ec8 100644
--- a/etc/latrace.d/dlfcn.conf
+++ b/etc/latrace.d/headers/dlfcn.h
diff --git a/etc/latrace.d/fcntl.conf b/etc/latrace.d/headers/fcntl.h
index d4eab51..d4eab51 100644
--- a/etc/latrace.d/fcntl.conf
+++ b/etc/latrace.d/headers/fcntl.h
diff --git a/etc/latrace.d/getopt.conf b/etc/latrace.d/headers/getopt.h
index 93692a2..93692a2 100644
--- a/etc/latrace.d/getopt.conf
+++ b/etc/latrace.d/headers/getopt.h
diff --git a/etc/latrace.d/inet.conf b/etc/latrace.d/headers/inet.h
index 25621f0..25621f0 100644
--- a/etc/latrace.d/inet.conf
+++ b/etc/latrace.d/headers/inet.h
diff --git a/etc/latrace.d/ioctl.conf b/etc/latrace.d/headers/ioctl.h
index 9de73e8..9de73e8 100644
--- a/etc/latrace.d/ioctl.conf
+++ b/etc/latrace.d/headers/ioctl.h
diff --git a/etc/latrace.conf b/etc/latrace.d/headers/latrace.h
index 11db4f7..f444438 100644
--- a/etc/latrace.conf
+++ b/etc/latrace.d/headers/latrace.h
@@ -1,97 +1,97 @@
 
 /* miscelaneous functions */
-#include "misc.conf"
+#include "misc.h"
 
 /* miscelaneous typedefs */
-#include "typedefs.conf"
+#include "typedefs.h"
 
 /* /usr/include/arpa/inet.h */
-#include "inet.conf"
+#include "inet.h"
 
 /* /usr/include/ctype.h */
-#include "ctype.conf"
+#include "ctype.h"
 
 /* /usr/include/stdlib.h */
-#include "stdlib.conf"
+#include "stdlib.h"
 
 /* /usr/include/string.h */
-#include "string.conf"
+#include "string.h"
 
 /* /usr/include/ctype.h */
-#include "ctype.conf"
+#include "ctype.h"
 
 /* /usr/include/ncurses.h */
-#include "ncurses.conf"
+#include "ncurses.h"
 
 /* /usr/include/stdio.h */
-#include "stdio.conf"
+#include "stdio.h"
 
 /* /usr/include/dirent.h */
-#include "dirent.conf"
+#include "dirent.h"
 
 /* /usr/include/unistd.h */
-#include "unistd.conf"
+#include "unistd.h"
 
 /* /usr/include/libintl.h */
-#include "libintl.conf"
+#include "libintl.h"
 
 /* /usr/include/dlfcn.h */
-#include "dlfcn.conf"
+#include "dlfcn.h"
 
 /* /usr/include/fcntl.h */
-#include "fcntl.conf"
+#include "fcntl.h"
 
 /* /usr/include/getopt.h */
-#include "getopt.conf"
+#include "getopt.h"
 
 /* /usr/include/signal.h */
-#include "signal.conf"
+#include "signal.h"
 
 /* /usr/include/sys/ioctl.h */
-#include "ioctl.conf"
+#include "ioctl.h"
 
 /* /usr/include/sys/socket.h */
-#include "socket.conf"
+#include "socket.h"
 
 /* /usr/include/netdb.h */
-#include "netdb.conf"
+#include "netdb.h"
 
 /* /usr/include/sys/stat.h */
-#include "stat.conf"
+#include "stat.h"
 
 /* /usr/include/sys/wait.h */
-#include "wait.conf"
+#include "wait.h"
 
 /* /usr/include/utmp.h */
-#include "utmp.conf"
+#include "utmp.h"
 
 /* /usr/include/time.h */
-#include "time.conf"
+#include "time.h"
 
 /* /usr/include/termios.h */
-#include "termios.conf"
+#include "termios.h"
 
 /* /usr/include/term.h */
-#include "term.conf"
+#include "term.h"
 
 /* /usr/include/sys/syslog.h */
-#include "syslog.conf"
+#include "syslog.h"
 
 /* /usr/include/pwd.h */
-#include "pwd.conf"
+#include "pwd.h"
 
 /* /usr/include/libio.h */
-#include "libio.conf"
+#include "libio.h"
 
 /* /usr/include/locale.h */
-#include "locale.conf"
+#include "locale.h"
 
 /* /usr/include/pthread.h */
-#include "pthread.conf"
+#include "pthread.h"
 
 /* /usr/include/sys/resource.h */
-#include "resource.conf"
+#include "resource.h"
 
-/* /etc/latrace.d/mman.conf */
-#include "mman.conf"
+/* /etc/latrace.d/mman.h */
+#include "mman.h"
 
diff --git a/etc/latrace.d/libintl.conf b/etc/latrace.d/headers/libintl.h
index bb80085..bb80085 100644
--- a/etc/latrace.d/libintl.conf
+++ b/etc/latrace.d/headers/libintl.h
diff --git a/etc/latrace.d/libio.conf b/etc/latrace.d/headers/libio.h
index 705c173..705c173 100644
--- a/etc/latrace.d/libio.conf
+++ b/etc/latrace.d/headers/libio.h
diff --git a/etc/latrace.d/locale.conf b/etc/latrace.d/headers/locale.h
index bb2e207..bb2e207 100644
--- a/etc/latrace.d/locale.conf
+++ b/etc/latrace.d/headers/locale.h
diff --git a/etc/latrace.d/misc.conf b/etc/latrace.d/headers/misc.h
index 40ef87e..40ef87e 100644
--- a/etc/latrace.d/misc.conf
+++ b/etc/latrace.d/headers/misc.h
diff --git a/etc/latrace.d/mman.conf b/etc/latrace.d/headers/mman.h
index 8792d22..8792d22 100644
--- a/etc/latrace.d/mman.conf
+++ b/etc/latrace.d/headers/mman.h
diff --git a/etc/latrace.d/ncurses.conf b/etc/latrace.d/headers/ncurses.h
index d226f1a..a3f5a71 100644
--- a/etc/latrace.d/ncurses.conf
+++ b/etc/latrace.d/headers/ncurses.h
@@ -1,5 +1,5 @@
 
-/* /usr/include/ncurses.conf */
+/* /usr/include/ncurses.h */
 
 typedef int     attr_t;
 typedef attr_t  chtype;
diff --git a/etc/latrace.d/netdb.conf b/etc/latrace.d/headers/netdb.h
index 4443d44..4443d44 100644
--- a/etc/latrace.d/netdb.conf
+++ b/etc/latrace.d/headers/netdb.h
diff --git a/etc/latrace.d/pthread.conf b/etc/latrace.d/headers/pthread.h
index 02ad872..02ad872 100644
--- a/etc/latrace.d/pthread.conf
+++ b/etc/latrace.d/headers/pthread.h
diff --git a/etc/latrace.d/pwd.conf b/etc/latrace.d/headers/pwd.h
index b2139a5..b2139a5 100644
--- a/etc/latrace.d/pwd.conf
+++ b/etc/latrace.d/headers/pwd.h
diff --git a/etc/latrace.d/resource.conf b/etc/latrace.d/headers/resource.h
index a548740..a548740 100644
--- a/etc/latrace.d/resource.conf
+++ b/etc/latrace.d/headers/resource.h
diff --git a/etc/latrace.d/signal.conf b/etc/latrace.d/headers/signal.h
index 11a9d2a..11a9d2a 100644
--- a/etc/latrace.d/signal.conf
+++ b/etc/latrace.d/headers/signal.h
diff --git a/etc/latrace.d/socket.conf b/etc/latrace.d/headers/socket.h
index 9e30f26..bcf450e 100644
--- a/etc/latrace.d/socket.conf
+++ b/etc/latrace.d/headers/socket.h
@@ -16,7 +16,7 @@ enum PF_TYPE {
 	PF_ROSE      = 11,     /* Amateur Radio X.25 PLP       */
 	PF_DECnet    = 12,     /* Reserved for DECnet project  */
 	PF_NETBEUI   = 13,     /* Reserved for 802.2LLC project*/
-	PF_SECURITY  = 14,     /* Security callback pseudo AF */ 
+	PF_SECURITY  = 14,     /* Security callback pseudo AF */
 	PF_KEY       = 15,     /* PF_KEY key management API */
 	PF_NETLINK   = 16,
 	PF_ROUTE     = 16,        /* Alias to emulate 4.4BSD */
@@ -40,7 +40,7 @@ enum PF_TYPE {
 };
 
 enum SOCK_TYPE {
-        SOCK_STREAM     = 1, 
+        SOCK_STREAM     = 1,
         SOCK_DGRAM      = 2,
         SOCK_RAW        = 3,
         SOCK_RDM        = 4,
diff --git a/etc/latrace.d/stat.conf b/etc/latrace.d/headers/stat.h
index fa60e9b..fa60e9b 100644
--- a/etc/latrace.d/stat.conf
+++ b/etc/latrace.d/headers/stat.h
diff --git a/etc/latrace.d/stdio.conf b/etc/latrace.d/headers/stdio.h
index c0f37b8..c0f37b8 100644
--- a/etc/latrace.d/stdio.conf
+++ b/etc/latrace.d/headers/stdio.h
diff --git a/etc/latrace.d/stdlib.conf b/etc/latrace.d/headers/stdlib.h
index 63afa71..63afa71 100644
--- a/etc/latrace.d/stdlib.conf
+++ b/etc/latrace.d/headers/stdlib.h
diff --git a/etc/latrace.d/string.conf b/etc/latrace.d/headers/string.h
index 1a31096..98c2cb3 100644
--- a/etc/latrace.d/string.conf
+++ b/etc/latrace.d/headers/string.h
@@ -62,7 +62,7 @@ char*   rindex(char *s, int c);
 int     ffs(int i);
 int     ffsl(long l);
 
-/*	we dont do big numbers so far 
+/*	we dont do big numbers so far
 
 __extension__ extern int ffsll (long long int __ll)
 
diff --git a/etc/latrace.d/headers/sysdeps/x86_64/latrace.h b/etc/latrace.d/headers/sysdeps/x86_64/latrace.h
new file mode 100644
index 0000000..731b719
--- /dev/null
+++ b/etc/latrace.d/headers/sysdeps/x86_64/latrace.h
@@ -0,0 +1,3 @@
+
+/* /usr/include/bits/syscall.h */
+#include "sysdeps/x86_64/syscall.h"
diff --git a/etc/sysdeps/x86_64/syscall.conf b/etc/latrace.d/headers/sysdeps/x86_64/syscall.h
index d655f85..d655f85 100644
--- a/etc/sysdeps/x86_64/syscall.conf
+++ b/etc/latrace.d/headers/sysdeps/x86_64/syscall.h
diff --git a/etc/latrace.d/syslog.conf b/etc/latrace.d/headers/syslog.h
index 7869b09..7869b09 100644
--- a/etc/latrace.d/syslog.conf
+++ b/etc/latrace.d/headers/syslog.h
diff --git a/etc/latrace.d/term.conf b/etc/latrace.d/headers/term.h
index 46f2d0a..46f2d0a 100644
--- a/etc/latrace.d/term.conf
+++ b/etc/latrace.d/headers/term.h
diff --git a/etc/latrace.d/termios.conf b/etc/latrace.d/headers/termios.h
index 46fcd85..46fcd85 100644
--- a/etc/latrace.d/termios.conf
+++ b/etc/latrace.d/headers/termios.h
diff --git a/etc/latrace.d/time.conf b/etc/latrace.d/headers/time.h
index 739e6b5..739e6b5 100644
--- a/etc/latrace.d/time.conf
+++ b/etc/latrace.d/headers/time.h
diff --git a/etc/latrace.d/typedefs.conf b/etc/latrace.d/headers/typedefs.h
index cb8adc0..cb8adc0 100644
--- a/etc/latrace.d/typedefs.conf
+++ b/etc/latrace.d/headers/typedefs.h
diff --git a/etc/latrace.d/unistd.conf b/etc/latrace.d/headers/unistd.h
index d7171b3..d7171b3 100644
--- a/etc/latrace.d/unistd.conf
+++ b/etc/latrace.d/headers/unistd.h
diff --git a/etc/latrace.d/utmp.conf b/etc/latrace.d/headers/utmp.h
index fb333eb..fb333eb 100644
--- a/etc/latrace.d/utmp.conf
+++ b/etc/latrace.d/headers/utmp.h
diff --git a/etc/latrace.d/wait.conf b/etc/latrace.d/headers/wait.h
index 427b38d..427b38d 100644
--- a/etc/latrace.d/wait.conf
+++ b/etc/latrace.d/headers/wait.h
diff --git a/etc/latrace.d/latrace.conf.in b/etc/latrace.d/latrace.conf.in
new file mode 100644
index 0000000..5183c85
--- /dev/null
+++ b/etc/latrace.d/latrace.conf.in
@@ -0,0 +1,18 @@
+
+INCLUDE krava.conf
+
+GLOBAL {
+	# headers definition
+	HEADERS = @sysconfdir@/latrace.d/headers/latrace.h
+
+	# options definitions
+
+	# -l, --libs
+	OPT_LIBS = krava
+
+	# -t, --libs-to
+	OPT_LIBS_TO = krava
+
+	# -p, --pipe
+	OPT_PIPE = yes
+}
diff --git a/etc/sysdeps/x86_64/latrace.conf b/etc/sysdeps/x86_64/latrace.conf
deleted file mode 100644
index 3fcc017..0000000
--- a/etc/sysdeps/x86_64/latrace.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-
-/* /usr/include/bits/syscall.h */
-#include "sysdeps/x86_64/syscall.conf"
diff --git a/src/Makefile b/src/Makefile
index 0ccec47..7263eec 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -67,7 +67,7 @@ OBJS+=$(LATRACE_OBJS)
 PROGRAMS+=$(LATRACE_BIN)
 CPPFLAGS+=-DCONFIG_LIBDIR=\"$(libdir)\"
 CPPFLAGS+=-DLT_ARGS_DEF_DIR=\"$(confdir)\"
-CPPFLAGS+=-DLT_ARGS_DEF_CONF=\"$(sysconfdir)/latrace.conf\"
+CPPFLAGS+=-DLT_ARGS_DEF_CONF=\"$(sysconfdir)/headers/latrace.h\"
 
 $(LATRACE_BIN): $(LATRACE_OBJS)
 	$(QUIET_LD)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LATRACE_OBJS) $(LATRACE_LIBS) $(LATRACE_LIB)