From f4a2102797b6ffe6d7f86b6c2846f16b67995f4f Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Sun, 15 Nov 2020 04:50:40 +0000
Subject: [PATCH] simplified build files

---
 hawk/bin/Makefile.am     |  26 ++---
 hawk/bin/Makefile.in     |  23 ++---
 hawk/lib/Makefile.am     |   6 +-
 hawk/lib/Makefile.in     |   4 +-
 hawk/mod/Makefile.am     |   6 +-
 hawk/mod/Makefile.in     |  19 ++--
 hawk/samples/Makefile.am |  42 ++++----
 hawk/samples/Makefile.in |  39 ++++---
 hawk/t/Makefile.am       |  48 +++++----
 hawk/t/Makefile.in       | 213 ++++++++++++++++++++++++++++++---------
 hawk/tools/Makefile.am   |  30 +++---
 hawk/tools/Makefile.in   |  52 +++++-----
 12 files changed, 313 insertions(+), 195 deletions(-)

diff --git a/hawk/bin/Makefile.am b/hawk/bin/Makefile.am
index 133f021f..00329c07 100644
--- a/hawk/bin/Makefile.am
+++ b/hawk/bin/Makefile.am
@@ -1,27 +1,22 @@
 AUTOMAKE_OPTIONS = nostdinc
 
-CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
 
-CPPFLAGS_ALL_COMMON = \
+CPPFLAGS_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_builddir)/../lib  \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
-
-LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(abs_builddir)/../lib -L$(libdir)
-
-CPPFLAGS_BIN_COMMON = $(CPPFLAGS_ALL_COMMON)
-LDFLAGS_BIN_COMMON = $(LDFLAGS_ALL_COMMON) -no-undefined
-
+CFLAGS_COMMON =
+LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir)
 ##
 ## -lm may get omitted from dependency_libs in libhawk.la.
 ## the generated libtool in the build directory may include -lm in postdeps
 ## dependency_libs excludes items in postdeps.
 ## specify -lm explicitly to satisfy dependency regardless of libtool behavior.
 ##
-LIBADD_BIN_COMMON = $(LIBM) 
+LIBADD_COMMON = -lhawk $(LIBM)
+DEPENDENCIES_COMMON = ../lib/libhawk.la
 
 bin_PROGRAMS = hawk
 
@@ -29,10 +24,9 @@ bin_PROGRAMS = hawk
 # hawk
 ##################################################
 hawk_SOURCES = main.c 
-hawk_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-hawk_CFLAGS = $(CFLAGS_ALL_COMMON)
-hawk_CXXFLAGS = $(CXXFLAGS_ALL_COMMON)
-hawk_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-hawk_LDADD = -lhawk $(LIBADD_BIN_COMMON) ### $(SOCKET_LIBS) $(PTHREAD_LIBS)
-hawk_DEPENDENCIES = ../lib/libhawk.la
+hawk_CPPFLAGS = $(CPPFLAGS_COMMON)
+hawk_CFLAGS = $(CFLAGS_COMMON)
+hawk_LDFLAGS = $(LDFLAGS_COMMON)
+hawk_LDADD = $(LIBADD_COMMON)
+hawk_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 
diff --git a/hawk/bin/Makefile.in b/hawk/bin/Makefile.in
index 7b581285..07a6eb3e 100644
--- a/hawk/bin/Makefile.in
+++ b/hawk/bin/Makefile.in
@@ -333,30 +333,27 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = nostdinc
-CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-CPPFLAGS_ALL_COMMON = \
+CPPFLAGS_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_builddir)/../lib  \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
 
-LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(abs_builddir)/../lib -L$(libdir)
-CPPFLAGS_BIN_COMMON = $(CPPFLAGS_ALL_COMMON)
-LDFLAGS_BIN_COMMON = $(LDFLAGS_ALL_COMMON) -no-undefined
-LIBADD_BIN_COMMON = $(LIBM) 
+CFLAGS_COMMON = 
+LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir)
+LIBADD_COMMON = -lhawk $(LIBM)
+DEPENDENCIES_COMMON = ../lib/libhawk.la
 
 ##################################################
 # hawk
 ##################################################
 hawk_SOURCES = main.c 
-hawk_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-hawk_CFLAGS = $(CFLAGS_ALL_COMMON)
-hawk_CXXFLAGS = $(CXXFLAGS_ALL_COMMON)
-hawk_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-hawk_LDADD = -lhawk $(LIBADD_BIN_COMMON) ### $(SOCKET_LIBS) $(PTHREAD_LIBS)
-hawk_DEPENDENCIES = ../lib/libhawk.la
+hawk_CPPFLAGS = $(CPPFLAGS_COMMON)
+hawk_CFLAGS = $(CFLAGS_COMMON)
+hawk_LDFLAGS = $(LDFLAGS_COMMON)
+hawk_LDADD = $(LIBADD_COMMON)
+hawk_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 all: all-am
 
 .SUFFIXES:
diff --git a/hawk/lib/Makefile.am b/hawk/lib/Makefile.am
index ed5b9180..c58e9869 100644
--- a/hawk/lib/Makefile.am
+++ b/hawk/lib/Makefile.am
@@ -1,13 +1,13 @@
 AUTOMAKE_OPTIONS = nostdinc
 
-CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-
 CPPFLAGS_ALL_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_srcdir) \
 	-I$(includedir)
 
+CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
+CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
+
 if ENABLE_STATIC_MODULE
 LDFLAGS_ALL_COMMON = -L$(abs_builddir)/../mod -L$(abs_builddir) -L$(libdir)
 else
diff --git a/hawk/lib/Makefile.in b/hawk/lib/Makefile.in
index 7f7baf02..4e6118a5 100644
--- a/hawk/lib/Makefile.in
+++ b/hawk/lib/Makefile.in
@@ -559,13 +559,13 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = nostdinc
-CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
 CPPFLAGS_ALL_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_srcdir) \
 	-I$(includedir)
 
+CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
+CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
 @ENABLE_STATIC_MODULE_FALSE@LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(libdir)
 @ENABLE_STATIC_MODULE_TRUE@LDFLAGS_ALL_COMMON = -L$(abs_builddir)/../mod -L$(abs_builddir) -L$(libdir)
 @WIN32_FALSE@CPPFLAGS_PFMOD = -DHAWK_DEFAULT_MODLIBDIRS=\"$(libdir)\" \
diff --git a/hawk/mod/Makefile.am b/hawk/mod/Makefile.am
index cece8b1c..87dfb4f3 100644
--- a/hawk/mod/Makefile.am
+++ b/hawk/mod/Makefile.am
@@ -1,7 +1,5 @@
 AUTOMAKE_OPTIONS = nostdinc
 
-##AM_CFLAGS = $(PTHREAD_CFLAGS)
-
 CPPFLAGS_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_builddir)/../lib \
@@ -9,6 +7,8 @@ CPPFLAGS_COMMON = \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
 
+CFLAGS_COMMON =
+
 ##################################################
 if ENABLE_STATIC_MODULE
 ##################################################
@@ -61,6 +61,7 @@ endif
 if ENABLE_MOD_MYSQL
 libhawk_mysql_la_SOURCES = mod-mysql.c mod-mysql.h
 libhawk_mysql_la_CPPFLAGS = $(CPPFLAGS_COMMON) $(MYSQL_CFLAGS)
+libhawk_mysql_la_CFLAGS = $(CFLAGS_COMMON) 
 libhawk_mysql_la_LDFLAGS = $(LDFLAGS_COMMON) $(MYSQL_LDFLAGS)
 libhawk_mysql_la_LIBADD = $(LIBADD_COMMON) $(MYSQL_LIBS)
 endif
@@ -68,6 +69,7 @@ endif
 if ENABLE_MOD_UCI
 libhawk_uci_la_SOURCES = mod-uci.c mod-uci.h
 libhawk_uci_la_CPPFLAGS = $(CPPFLAGS_COMMON)
+libhawk_uci_la_CFLAGS = $(CFLAGS_COMMON) 
 libhawk_uci_la_LDFLAGS = $(LDFLAGS_COMMON)
 libhawk_uci_la_LIBADD = $(LIBADD_COMMON) $(UCI_LIBS)
 endif
diff --git a/hawk/mod/Makefile.in b/hawk/mod/Makefile.in
index a1674f67..319b9c3e 100644
--- a/hawk/mod/Makefile.in
+++ b/hawk/mod/Makefile.in
@@ -153,8 +153,8 @@ am__v_lt_0 = --silent
 am__v_lt_1 = 
 libhawk_mysql_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libhawk_mysql_la_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(libhawk_mysql_la_CFLAGS) $(CFLAGS) \
+	$(libhawk_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
 @ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_FALSE@am_libhawk_mysql_la_rpath =  \
 @ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_FALSE@	-rpath \
 @ENABLE_MOD_MYSQL_TRUE@@ENABLE_STATIC_MODULE_FALSE@	$(pkgmodexecdir)
@@ -168,8 +168,8 @@ am__libhawk_uci_la_SOURCES_DIST = mod-uci.c mod-uci.h
 libhawk_uci_la_OBJECTS = $(am_libhawk_uci_la_OBJECTS)
 libhawk_uci_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libhawk_uci_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
+	$(libhawk_uci_la_CFLAGS) $(CFLAGS) $(libhawk_uci_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 @ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_FALSE@am_libhawk_uci_la_rpath =  \
 @ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_FALSE@	-rpath \
 @ENABLE_MOD_UCI_TRUE@@ENABLE_STATIC_MODULE_FALSE@	$(pkgmodexecdir)
@@ -396,6 +396,7 @@ CPPFLAGS_COMMON = \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
 
+CFLAGS_COMMON = 
 
 ##################################################
 ##################################################
@@ -428,10 +429,12 @@ CPPFLAGS_COMMON = \
 #-------------------------------------------------
 @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_SOURCES = mod-mysql.c mod-mysql.h
 @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_CPPFLAGS = $(CPPFLAGS_COMMON) $(MYSQL_CFLAGS)
+@ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_CFLAGS = $(CFLAGS_COMMON) 
 @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_LDFLAGS = $(LDFLAGS_COMMON) $(MYSQL_LDFLAGS)
 @ENABLE_MOD_MYSQL_TRUE@libhawk_mysql_la_LIBADD = $(LIBADD_COMMON) $(MYSQL_LIBS)
 @ENABLE_MOD_UCI_TRUE@libhawk_uci_la_SOURCES = mod-uci.c mod-uci.h
 @ENABLE_MOD_UCI_TRUE@libhawk_uci_la_CPPFLAGS = $(CPPFLAGS_COMMON)
+@ENABLE_MOD_UCI_TRUE@libhawk_uci_la_CFLAGS = $(CFLAGS_COMMON) 
 @ENABLE_MOD_UCI_TRUE@libhawk_uci_la_LDFLAGS = $(LDFLAGS_COMMON)
 @ENABLE_MOD_UCI_TRUE@libhawk_uci_la_LIBADD = $(LIBADD_COMMON) $(UCI_LIBS)
 all: all-am
@@ -560,18 +563,18 @@ am--depfiles: $(am__depfiles_remade)
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 libhawk_mysql_la-mod-mysql.lo: mod-mysql.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_mysql_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhawk_mysql_la-mod-mysql.lo -MD -MP -MF $(DEPDIR)/libhawk_mysql_la-mod-mysql.Tpo -c -o libhawk_mysql_la-mod-mysql.lo `test -f 'mod-mysql.c' || echo '$(srcdir)/'`mod-mysql.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_mysql_la_CPPFLAGS) $(CPPFLAGS) $(libhawk_mysql_la_CFLAGS) $(CFLAGS) -MT libhawk_mysql_la-mod-mysql.lo -MD -MP -MF $(DEPDIR)/libhawk_mysql_la-mod-mysql.Tpo -c -o libhawk_mysql_la-mod-mysql.lo `test -f 'mod-mysql.c' || echo '$(srcdir)/'`mod-mysql.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_mysql_la-mod-mysql.Tpo $(DEPDIR)/libhawk_mysql_la-mod-mysql.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mod-mysql.c' object='libhawk_mysql_la-mod-mysql.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_mysql_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhawk_mysql_la-mod-mysql.lo `test -f 'mod-mysql.c' || echo '$(srcdir)/'`mod-mysql.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_mysql_la_CPPFLAGS) $(CPPFLAGS) $(libhawk_mysql_la_CFLAGS) $(CFLAGS) -c -o libhawk_mysql_la-mod-mysql.lo `test -f 'mod-mysql.c' || echo '$(srcdir)/'`mod-mysql.c
 
 libhawk_uci_la-mod-uci.lo: mod-uci.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_uci_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhawk_uci_la-mod-uci.lo -MD -MP -MF $(DEPDIR)/libhawk_uci_la-mod-uci.Tpo -c -o libhawk_uci_la-mod-uci.lo `test -f 'mod-uci.c' || echo '$(srcdir)/'`mod-uci.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_uci_la_CPPFLAGS) $(CPPFLAGS) $(libhawk_uci_la_CFLAGS) $(CFLAGS) -MT libhawk_uci_la-mod-uci.lo -MD -MP -MF $(DEPDIR)/libhawk_uci_la-mod-uci.Tpo -c -o libhawk_uci_la-mod-uci.lo `test -f 'mod-uci.c' || echo '$(srcdir)/'`mod-uci.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libhawk_uci_la-mod-uci.Tpo $(DEPDIR)/libhawk_uci_la-mod-uci.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mod-uci.c' object='libhawk_uci_la-mod-uci.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_uci_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhawk_uci_la-mod-uci.lo `test -f 'mod-uci.c' || echo '$(srcdir)/'`mod-uci.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhawk_uci_la_CPPFLAGS) $(CPPFLAGS) $(libhawk_uci_la_CFLAGS) $(CFLAGS) -c -o libhawk_uci_la-mod-uci.lo `test -f 'mod-uci.c' || echo '$(srcdir)/'`mod-uci.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/hawk/samples/Makefile.am b/hawk/samples/Makefile.am
index e78f34ce..27eb3d18 100644
--- a/hawk/samples/Makefile.am
+++ b/hawk/samples/Makefile.am
@@ -1,44 +1,38 @@
 AUTOMAKE_OPTIONS = nostdinc
 
-CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-
-CPPFLAGS_ALL_COMMON = \
+CPPFLAGS_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_builddir)/../lib  \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
 
-LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(abs_builddir)/../lib -L$(libdir)
-
-CPPFLAGS_BIN_COMMON = $(CPPFLAGS_ALL_COMMON)
-CFLAGS_BIN_COMMON = $(CFLAGS_ALL_COMMON)
-CXXFLAGS_BIN_COMMON = $(CXXFLAGS_ALL_COMMON)
-LDFLAGS_BIN_COMMON = $(LDFLAGS_ALL_COMMON) -no-undefined
-LIBADD_BIN_COMMON = $(LIBM) 
+CFLAGS_COMMON =
+CXXFLAGS_COMMON =
+LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir)
+LIBADD_COMMON = -lhawk $(LIBM)
+DEPENDENCIES_COMMON = ../lib/libhawk.la
 
 bin_PROGRAMS = 
 
-
 if ENABLE_CXX
 
 bin_PROGRAMS += hawk02 hawk51
 
 hawk02_SOURCES = hawk02.c
-hawk02_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-hawk02_CFLAGS = $(CFLAGS_ALL_COMMON)
-hawk02_CXXFLAGS = $(CXXFLAGS_ALL_COMMON)
-hawk02_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-hawk02_LDADD = -lhawk $(LIBADD_BIN_COMMON) ### $(SOCKET_LIBS) $(PTHREAD_LIBS)
-hawk02_DEPENDENCIES = ../lib/libhawk.la
+hawk02_CPPFLAGS = $(CPPFLAGS_COMMON)
+hawk02_CFLAGS = $(CFLAGS_COMMON)
+hawk02_CXXFLAGS = $(CXXFLAGS_COMMON)
+hawk02_LDFLAGS = $(LDFLAGS_COMMON)
+hawk02_LDADD = $(LIBADD_COMMON)
+hawk02_DEPENDENCIES = $(DEPENDENCIES_COMON)
 
 hawk51_SOURCES = hawk51.cpp
-hawk51_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-hawk51_CFLAGS = $(CFLAGS_ALL_COMMON)
-hawk51_CXXFLAGS = $(CXXFLAGS_ALL_COMMON)
-hawk51_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-hawk51_LDADD = -lhawk $(LIBADD_BIN_COMMON) ### $(SOCKET_LIBS) $(PTHREAD_LIBS)
-hawk51_DEPENDENCIES = ../lib/libhawk.la
+hawk51_CPPFLAGS = $(CPPFLAGS_COMMON)
+hawk51_CFLAGS = $(CFLAGS_COMMON)
+hawk51_CXXFLAGS = $(CXXFLAGS_COMMON)
+hawk51_LDFLAGS = $(LDFLAGS_COMMON)
+hawk51_LDADD = $(LIBADD_COMMON)
+hawk51_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 
 endif
diff --git a/hawk/samples/Makefile.in b/hawk/samples/Makefile.in
index ad8d557c..e1cbc25f 100644
--- a/hawk/samples/Makefile.in
+++ b/hawk/samples/Makefile.in
@@ -361,35 +361,32 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = nostdinc
-CFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-CXXFLAGS_ALL_COMMON = $(PTHREAD_CFLAGS)
-CPPFLAGS_ALL_COMMON = \
+CPPFLAGS_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_builddir)/../lib  \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
 
-LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(abs_builddir)/../lib -L$(libdir)
-CPPFLAGS_BIN_COMMON = $(CPPFLAGS_ALL_COMMON)
-CFLAGS_BIN_COMMON = $(CFLAGS_ALL_COMMON)
-CXXFLAGS_BIN_COMMON = $(CXXFLAGS_ALL_COMMON)
-LDFLAGS_BIN_COMMON = $(LDFLAGS_ALL_COMMON) -no-undefined
-LIBADD_BIN_COMMON = $(LIBM) 
+CFLAGS_COMMON = 
+CXXFLAGS_COMMON = 
+LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir)
+LIBADD_COMMON = -lhawk $(LIBM)
+DEPENDENCIES_COMMON = ../lib/libhawk.la
 @ENABLE_CXX_TRUE@hawk02_SOURCES = hawk02.c
-@ENABLE_CXX_TRUE@hawk02_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-@ENABLE_CXX_TRUE@hawk02_CFLAGS = $(CFLAGS_ALL_COMMON)
-@ENABLE_CXX_TRUE@hawk02_CXXFLAGS = $(CXXFLAGS_ALL_COMMON)
-@ENABLE_CXX_TRUE@hawk02_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-@ENABLE_CXX_TRUE@hawk02_LDADD = -lhawk $(LIBADD_BIN_COMMON) ### $(SOCKET_LIBS) $(PTHREAD_LIBS)
-@ENABLE_CXX_TRUE@hawk02_DEPENDENCIES = ../lib/libhawk.la
+@ENABLE_CXX_TRUE@hawk02_CPPFLAGS = $(CPPFLAGS_COMMON)
+@ENABLE_CXX_TRUE@hawk02_CFLAGS = $(CFLAGS_COMMON)
+@ENABLE_CXX_TRUE@hawk02_CXXFLAGS = $(CXXFLAGS_COMMON)
+@ENABLE_CXX_TRUE@hawk02_LDFLAGS = $(LDFLAGS_COMMON)
+@ENABLE_CXX_TRUE@hawk02_LDADD = $(LIBADD_COMMON)
+@ENABLE_CXX_TRUE@hawk02_DEPENDENCIES = $(DEPENDENCIES_COMON)
 @ENABLE_CXX_TRUE@hawk51_SOURCES = hawk51.cpp
-@ENABLE_CXX_TRUE@hawk51_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-@ENABLE_CXX_TRUE@hawk51_CFLAGS = $(CFLAGS_ALL_COMMON)
-@ENABLE_CXX_TRUE@hawk51_CXXFLAGS = $(CXXFLAGS_ALL_COMMON)
-@ENABLE_CXX_TRUE@hawk51_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-@ENABLE_CXX_TRUE@hawk51_LDADD = -lhawk $(LIBADD_BIN_COMMON) ### $(SOCKET_LIBS) $(PTHREAD_LIBS)
-@ENABLE_CXX_TRUE@hawk51_DEPENDENCIES = ../lib/libhawk.la
+@ENABLE_CXX_TRUE@hawk51_CPPFLAGS = $(CPPFLAGS_COMMON)
+@ENABLE_CXX_TRUE@hawk51_CFLAGS = $(CFLAGS_COMMON)
+@ENABLE_CXX_TRUE@hawk51_CXXFLAGS = $(CXXFLAGS_COMMON)
+@ENABLE_CXX_TRUE@hawk51_LDFLAGS = $(LDFLAGS_COMMON)
+@ENABLE_CXX_TRUE@hawk51_LDADD = $(LIBADD_COMMON)
+@ENABLE_CXX_TRUE@hawk51_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 all: all-am
 
 .SUFFIXES:
diff --git a/hawk/t/Makefile.am b/hawk/t/Makefile.am
index 420a929c..931e2dca 100644
--- a/hawk/t/Makefile.am
+++ b/hawk/t/Makefile.am
@@ -1,17 +1,15 @@
 AUTOMAKE_OPTIONS = nostdinc
 
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-
-AM_CPPFLAGS = \
+CPPFLAGS_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_builddir)/../lib \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
-
-AM_LDFLAGS = -L$(abs_builddir)/../lib  -L$(libdir)
-LDADD = $(LIBM)
+CFLAGS_COMMON =
+LDFLAGS_COMMON=-L$(abs_builddir)/../lib  -L$(libdir)
+LIBADD_COMMON = -lhawk $(LIBM)
+DEPENDENCIES_COMMON = ../lib/libhawk.la
 
 check_SCRIPTS = h-001.hawk h-002.hawk
 ##noinst_SCRIPTS = $(check_SCRIPTS)
@@ -20,26 +18,42 @@ EXTRA_DIST = $(check_SCRIPTS)
 check_PROGRAMS = t-001 t-002 t-003 t-004 t-005 t-006
 
 t_001_SOURCES = t-001.c t.h
+t_001_CPPFLAGS = $(CPPFLAGS_COMMON)
 
 t_002_SOURCES = t-002.c t.h
-t_002_LDADD = -lhawk $(LDADD)
-t_002_DEPENDENCIES = ../lib/libhawk.la
+t_002_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_002_CFLAGS = $(CFLAGS_COMMON)
+t_002_LDFLAGS = $(LDFLAGS_COMMON)
+t_002_LDADD = $(LIBADD_COMMON)
+t_002_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 
 t_003_SOURCES = t-003.c t.h
-t_003_LDADD = -lhawk $(LDADD)
-t_003_DEPENDENCIES = ../lib/libhawk.la
+t_003_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_003_CFLAGS = $(CFLAGS_COMMON)
+t_003_LDFLAGS = $(LDFLAGS_COMMON)
+t_003_LDADD = $(LIBADD_COMMON)
+t_003_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 
 t_004_SOURCES = t-004.c t.h
-t_004_LDADD = -lhawk $(LDADD)
-t_004_DEPENDENCIES = ../lib/libhawk.la
+t_004_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_004_CFLAGS = $(CFLAGS_COMMON)
+t_004_LDFLAGS = $(LDFLAGS_COMMON)
+t_004_LDADD = $(LIBADD_COMMON)
+t_004_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 
 t_005_SOURCES = t-005.c t.h
-t_005_LDADD = -lhawk $(LDADD)
-t_005_DEPENDENCIES = ../lib/libhawk.la
+t_005_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_005_CFLAGS = $(CFLAGS_COMMON)
+t_005_LDFLAGS = $(LDFLAGS_COMMON)
+t_005_LDADD = $(LIBADD_COMMON)
+t_005_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 
 t_006_SOURCES = t-006.c t.h
-t_006_LDADD = -lhawk $(LDADD)
-t_006_DEPENDENCIES = ../lib/libhawk.la
+t_006_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_006_CFLAGS = $(CFLAGS_COMMON)
+t_006_LDFLAGS = $(LDFLAGS_COMMON)
+t_006_LDADD = $(LIBADD_COMMON)
+t_006_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
diff --git a/hawk/t/Makefile.in b/hawk/t/Makefile.in
index 0e911804..e13e836f 100644
--- a/hawk/t/Makefile.in
+++ b/hawk/t/Makefile.in
@@ -107,26 +107,40 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/lib/hawk-cfg.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am_t_001_OBJECTS = t-001.$(OBJEXT)
+am_t_001_OBJECTS = t_001-t-001.$(OBJEXT)
 t_001_OBJECTS = $(am_t_001_OBJECTS)
 t_001_LDADD = $(LDADD)
-am__DEPENDENCIES_1 =
-t_001_DEPENDENCIES = $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-am_t_002_OBJECTS = t-002.$(OBJEXT)
+am_t_002_OBJECTS = t_002-t-002.$(OBJEXT)
 t_002_OBJECTS = $(am_t_002_OBJECTS)
+am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-am_t_003_OBJECTS = t-003.$(OBJEXT)
+t_002_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_002_CFLAGS) $(CFLAGS) \
+	$(t_002_LDFLAGS) $(LDFLAGS) -o $@
+am_t_003_OBJECTS = t_003-t-003.$(OBJEXT)
 t_003_OBJECTS = $(am_t_003_OBJECTS)
-am_t_004_OBJECTS = t-004.$(OBJEXT)
+t_003_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_003_CFLAGS) $(CFLAGS) \
+	$(t_003_LDFLAGS) $(LDFLAGS) -o $@
+am_t_004_OBJECTS = t_004-t-004.$(OBJEXT)
 t_004_OBJECTS = $(am_t_004_OBJECTS)
-am_t_005_OBJECTS = t-005.$(OBJEXT)
+t_004_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_004_CFLAGS) $(CFLAGS) \
+	$(t_004_LDFLAGS) $(LDFLAGS) -o $@
+am_t_005_OBJECTS = t_005-t-005.$(OBJEXT)
 t_005_OBJECTS = $(am_t_005_OBJECTS)
-am_t_006_OBJECTS = t-006.$(OBJEXT)
+t_005_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_005_CFLAGS) $(CFLAGS) \
+	$(t_005_LDFLAGS) $(LDFLAGS) -o $@
+am_t_006_OBJECTS = t_006-t-006.$(OBJEXT)
 t_006_OBJECTS = $(am_t_006_OBJECTS)
+t_006_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(t_006_CFLAGS) $(CFLAGS) \
+	$(t_006_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -142,9 +156,10 @@ am__v_at_1 =
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/ac/depcomp
 am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/t-001.Po ./$(DEPDIR)/t-002.Po \
-	./$(DEPDIR)/t-003.Po ./$(DEPDIR)/t-004.Po ./$(DEPDIR)/t-005.Po \
-	./$(DEPDIR)/t-006.Po
+am__depfiles_remade = ./$(DEPDIR)/t_001-t-001.Po \
+	./$(DEPDIR)/t_002-t-002.Po ./$(DEPDIR)/t_003-t-003.Po \
+	./$(DEPDIR)/t_004-t-004.Po ./$(DEPDIR)/t_005-t-005.Po \
+	./$(DEPDIR)/t_006-t-006.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -548,35 +563,51 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = nostdinc
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-AM_CXXFLAGS = $(PTHREAD_CFLAGS)
-AM_CPPFLAGS = \
+CPPFLAGS_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_builddir)/../lib \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
 
-AM_LDFLAGS = -L$(abs_builddir)/../lib  -L$(libdir)
-LDADD = $(LIBM)
+CFLAGS_COMMON = 
+LDFLAGS_COMMON = -L$(abs_builddir)/../lib  -L$(libdir)
+LIBADD_COMMON = -lhawk $(LIBM)
+DEPENDENCIES_COMMON = ../lib/libhawk.la
 check_SCRIPTS = h-001.hawk h-002.hawk
 EXTRA_DIST = $(check_SCRIPTS)
 t_001_SOURCES = t-001.c t.h
+t_001_CPPFLAGS = $(CPPFLAGS_COMMON)
 t_002_SOURCES = t-002.c t.h
-t_002_LDADD = -lhawk $(LDADD)
-t_002_DEPENDENCIES = ../lib/libhawk.la
+t_002_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_002_CFLAGS = $(CFLAGS_COMMON)
+t_002_LDFLAGS = $(LDFLAGS_COMMON)
+t_002_LDADD = $(LIBADD_COMMON)
+t_002_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 t_003_SOURCES = t-003.c t.h
-t_003_LDADD = -lhawk $(LDADD)
-t_003_DEPENDENCIES = ../lib/libhawk.la
+t_003_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_003_CFLAGS = $(CFLAGS_COMMON)
+t_003_LDFLAGS = $(LDFLAGS_COMMON)
+t_003_LDADD = $(LIBADD_COMMON)
+t_003_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 t_004_SOURCES = t-004.c t.h
-t_004_LDADD = -lhawk $(LDADD)
-t_004_DEPENDENCIES = ../lib/libhawk.la
+t_004_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_004_CFLAGS = $(CFLAGS_COMMON)
+t_004_LDFLAGS = $(LDFLAGS_COMMON)
+t_004_LDADD = $(LIBADD_COMMON)
+t_004_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 t_005_SOURCES = t-005.c t.h
-t_005_LDADD = -lhawk $(LDADD)
-t_005_DEPENDENCIES = ../lib/libhawk.la
+t_005_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_005_CFLAGS = $(CFLAGS_COMMON)
+t_005_LDFLAGS = $(LDFLAGS_COMMON)
+t_005_LDADD = $(LIBADD_COMMON)
+t_005_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 t_006_SOURCES = t-006.c t.h
-t_006_LDADD = -lhawk $(LDADD)
-t_006_DEPENDENCIES = ../lib/libhawk.la
+t_006_CPPFLAGS = $(CPPFLAGS_COMMON)
+t_006_CFLAGS = $(CFLAGS_COMMON)
+t_006_LDFLAGS = $(LDFLAGS_COMMON)
+t_006_LDADD = $(LIBADD_COMMON)
+t_006_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 TEST_EXTENSIONS = .hawk
 HAWK_LOG_COMPILER = ../bin/hawk
@@ -630,23 +661,23 @@ t-001$(EXEEXT): $(t_001_OBJECTS) $(t_001_DEPENDENCIES) $(EXTRA_t_001_DEPENDENCIE
 
 t-002$(EXEEXT): $(t_002_OBJECTS) $(t_002_DEPENDENCIES) $(EXTRA_t_002_DEPENDENCIES) 
 	@rm -f t-002$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(t_002_OBJECTS) $(t_002_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(t_002_LINK) $(t_002_OBJECTS) $(t_002_LDADD) $(LIBS)
 
 t-003$(EXEEXT): $(t_003_OBJECTS) $(t_003_DEPENDENCIES) $(EXTRA_t_003_DEPENDENCIES) 
 	@rm -f t-003$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(t_003_OBJECTS) $(t_003_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(t_003_LINK) $(t_003_OBJECTS) $(t_003_LDADD) $(LIBS)
 
 t-004$(EXEEXT): $(t_004_OBJECTS) $(t_004_DEPENDENCIES) $(EXTRA_t_004_DEPENDENCIES) 
 	@rm -f t-004$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(t_004_OBJECTS) $(t_004_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(t_004_LINK) $(t_004_OBJECTS) $(t_004_LDADD) $(LIBS)
 
 t-005$(EXEEXT): $(t_005_OBJECTS) $(t_005_DEPENDENCIES) $(EXTRA_t_005_DEPENDENCIES) 
 	@rm -f t-005$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(t_005_OBJECTS) $(t_005_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(t_005_LINK) $(t_005_OBJECTS) $(t_005_LDADD) $(LIBS)
 
 t-006$(EXEEXT): $(t_006_OBJECTS) $(t_006_DEPENDENCIES) $(EXTRA_t_006_DEPENDENCIES) 
 	@rm -f t-006$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(t_006_OBJECTS) $(t_006_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(t_006_LINK) $(t_006_OBJECTS) $(t_006_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -654,12 +685,12 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-001.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-002.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-003.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-004.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-005.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-006.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_001-t-001.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_002-t-002.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_003-t-003.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_004-t-004.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_005-t-005.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_006-t-006.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -691,6 +722,90 @@ am--depfiles: $(am__depfiles_remade)
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+t_001-t-001.o: t-001.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_001_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_001-t-001.o -MD -MP -MF $(DEPDIR)/t_001-t-001.Tpo -c -o t_001-t-001.o `test -f 't-001.c' || echo '$(srcdir)/'`t-001.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_001-t-001.Tpo $(DEPDIR)/t_001-t-001.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-001.c' object='t_001-t-001.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_001_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_001-t-001.o `test -f 't-001.c' || echo '$(srcdir)/'`t-001.c
+
+t_001-t-001.obj: t-001.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_001_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT t_001-t-001.obj -MD -MP -MF $(DEPDIR)/t_001-t-001.Tpo -c -o t_001-t-001.obj `if test -f 't-001.c'; then $(CYGPATH_W) 't-001.c'; else $(CYGPATH_W) '$(srcdir)/t-001.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_001-t-001.Tpo $(DEPDIR)/t_001-t-001.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-001.c' object='t_001-t-001.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_001_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o t_001-t-001.obj `if test -f 't-001.c'; then $(CYGPATH_W) 't-001.c'; else $(CYGPATH_W) '$(srcdir)/t-001.c'; fi`
+
+t_002-t-002.o: t-002.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_002_CPPFLAGS) $(CPPFLAGS) $(t_002_CFLAGS) $(CFLAGS) -MT t_002-t-002.o -MD -MP -MF $(DEPDIR)/t_002-t-002.Tpo -c -o t_002-t-002.o `test -f 't-002.c' || echo '$(srcdir)/'`t-002.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_002-t-002.Tpo $(DEPDIR)/t_002-t-002.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-002.c' object='t_002-t-002.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_002_CPPFLAGS) $(CPPFLAGS) $(t_002_CFLAGS) $(CFLAGS) -c -o t_002-t-002.o `test -f 't-002.c' || echo '$(srcdir)/'`t-002.c
+
+t_002-t-002.obj: t-002.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_002_CPPFLAGS) $(CPPFLAGS) $(t_002_CFLAGS) $(CFLAGS) -MT t_002-t-002.obj -MD -MP -MF $(DEPDIR)/t_002-t-002.Tpo -c -o t_002-t-002.obj `if test -f 't-002.c'; then $(CYGPATH_W) 't-002.c'; else $(CYGPATH_W) '$(srcdir)/t-002.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_002-t-002.Tpo $(DEPDIR)/t_002-t-002.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-002.c' object='t_002-t-002.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_002_CPPFLAGS) $(CPPFLAGS) $(t_002_CFLAGS) $(CFLAGS) -c -o t_002-t-002.obj `if test -f 't-002.c'; then $(CYGPATH_W) 't-002.c'; else $(CYGPATH_W) '$(srcdir)/t-002.c'; fi`
+
+t_003-t-003.o: t-003.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_003_CPPFLAGS) $(CPPFLAGS) $(t_003_CFLAGS) $(CFLAGS) -MT t_003-t-003.o -MD -MP -MF $(DEPDIR)/t_003-t-003.Tpo -c -o t_003-t-003.o `test -f 't-003.c' || echo '$(srcdir)/'`t-003.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_003-t-003.Tpo $(DEPDIR)/t_003-t-003.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-003.c' object='t_003-t-003.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_003_CPPFLAGS) $(CPPFLAGS) $(t_003_CFLAGS) $(CFLAGS) -c -o t_003-t-003.o `test -f 't-003.c' || echo '$(srcdir)/'`t-003.c
+
+t_003-t-003.obj: t-003.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_003_CPPFLAGS) $(CPPFLAGS) $(t_003_CFLAGS) $(CFLAGS) -MT t_003-t-003.obj -MD -MP -MF $(DEPDIR)/t_003-t-003.Tpo -c -o t_003-t-003.obj `if test -f 't-003.c'; then $(CYGPATH_W) 't-003.c'; else $(CYGPATH_W) '$(srcdir)/t-003.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_003-t-003.Tpo $(DEPDIR)/t_003-t-003.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-003.c' object='t_003-t-003.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_003_CPPFLAGS) $(CPPFLAGS) $(t_003_CFLAGS) $(CFLAGS) -c -o t_003-t-003.obj `if test -f 't-003.c'; then $(CYGPATH_W) 't-003.c'; else $(CYGPATH_W) '$(srcdir)/t-003.c'; fi`
+
+t_004-t-004.o: t-004.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_004_CPPFLAGS) $(CPPFLAGS) $(t_004_CFLAGS) $(CFLAGS) -MT t_004-t-004.o -MD -MP -MF $(DEPDIR)/t_004-t-004.Tpo -c -o t_004-t-004.o `test -f 't-004.c' || echo '$(srcdir)/'`t-004.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_004-t-004.Tpo $(DEPDIR)/t_004-t-004.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-004.c' object='t_004-t-004.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_004_CPPFLAGS) $(CPPFLAGS) $(t_004_CFLAGS) $(CFLAGS) -c -o t_004-t-004.o `test -f 't-004.c' || echo '$(srcdir)/'`t-004.c
+
+t_004-t-004.obj: t-004.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_004_CPPFLAGS) $(CPPFLAGS) $(t_004_CFLAGS) $(CFLAGS) -MT t_004-t-004.obj -MD -MP -MF $(DEPDIR)/t_004-t-004.Tpo -c -o t_004-t-004.obj `if test -f 't-004.c'; then $(CYGPATH_W) 't-004.c'; else $(CYGPATH_W) '$(srcdir)/t-004.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_004-t-004.Tpo $(DEPDIR)/t_004-t-004.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-004.c' object='t_004-t-004.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_004_CPPFLAGS) $(CPPFLAGS) $(t_004_CFLAGS) $(CFLAGS) -c -o t_004-t-004.obj `if test -f 't-004.c'; then $(CYGPATH_W) 't-004.c'; else $(CYGPATH_W) '$(srcdir)/t-004.c'; fi`
+
+t_005-t-005.o: t-005.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_005_CPPFLAGS) $(CPPFLAGS) $(t_005_CFLAGS) $(CFLAGS) -MT t_005-t-005.o -MD -MP -MF $(DEPDIR)/t_005-t-005.Tpo -c -o t_005-t-005.o `test -f 't-005.c' || echo '$(srcdir)/'`t-005.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_005-t-005.Tpo $(DEPDIR)/t_005-t-005.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-005.c' object='t_005-t-005.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_005_CPPFLAGS) $(CPPFLAGS) $(t_005_CFLAGS) $(CFLAGS) -c -o t_005-t-005.o `test -f 't-005.c' || echo '$(srcdir)/'`t-005.c
+
+t_005-t-005.obj: t-005.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_005_CPPFLAGS) $(CPPFLAGS) $(t_005_CFLAGS) $(CFLAGS) -MT t_005-t-005.obj -MD -MP -MF $(DEPDIR)/t_005-t-005.Tpo -c -o t_005-t-005.obj `if test -f 't-005.c'; then $(CYGPATH_W) 't-005.c'; else $(CYGPATH_W) '$(srcdir)/t-005.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_005-t-005.Tpo $(DEPDIR)/t_005-t-005.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-005.c' object='t_005-t-005.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_005_CPPFLAGS) $(CPPFLAGS) $(t_005_CFLAGS) $(CFLAGS) -c -o t_005-t-005.obj `if test -f 't-005.c'; then $(CYGPATH_W) 't-005.c'; else $(CYGPATH_W) '$(srcdir)/t-005.c'; fi`
+
+t_006-t-006.o: t-006.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_006_CPPFLAGS) $(CPPFLAGS) $(t_006_CFLAGS) $(CFLAGS) -MT t_006-t-006.o -MD -MP -MF $(DEPDIR)/t_006-t-006.Tpo -c -o t_006-t-006.o `test -f 't-006.c' || echo '$(srcdir)/'`t-006.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_006-t-006.Tpo $(DEPDIR)/t_006-t-006.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-006.c' object='t_006-t-006.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_006_CPPFLAGS) $(CPPFLAGS) $(t_006_CFLAGS) $(CFLAGS) -c -o t_006-t-006.o `test -f 't-006.c' || echo '$(srcdir)/'`t-006.c
+
+t_006-t-006.obj: t-006.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_006_CPPFLAGS) $(CPPFLAGS) $(t_006_CFLAGS) $(CFLAGS) -MT t_006-t-006.obj -MD -MP -MF $(DEPDIR)/t_006-t-006.Tpo -c -o t_006-t-006.obj `if test -f 't-006.c'; then $(CYGPATH_W) 't-006.c'; else $(CYGPATH_W) '$(srcdir)/t-006.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/t_006-t-006.Tpo $(DEPDIR)/t_006-t-006.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='t-006.c' object='t_006-t-006.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(t_006_CPPFLAGS) $(CPPFLAGS) $(t_006_CFLAGS) $(CFLAGS) -c -o t_006-t-006.obj `if test -f 't-006.c'; then $(CYGPATH_W) 't-006.c'; else $(CYGPATH_W) '$(srcdir)/t-006.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1025,12 +1140,12 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/t-001.Po
-	-rm -f ./$(DEPDIR)/t-002.Po
-	-rm -f ./$(DEPDIR)/t-003.Po
-	-rm -f ./$(DEPDIR)/t-004.Po
-	-rm -f ./$(DEPDIR)/t-005.Po
-	-rm -f ./$(DEPDIR)/t-006.Po
+		-rm -f ./$(DEPDIR)/t_001-t-001.Po
+	-rm -f ./$(DEPDIR)/t_002-t-002.Po
+	-rm -f ./$(DEPDIR)/t_003-t-003.Po
+	-rm -f ./$(DEPDIR)/t_004-t-004.Po
+	-rm -f ./$(DEPDIR)/t_005-t-005.Po
+	-rm -f ./$(DEPDIR)/t_006-t-006.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1076,12 +1191,12 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/t-001.Po
-	-rm -f ./$(DEPDIR)/t-002.Po
-	-rm -f ./$(DEPDIR)/t-003.Po
-	-rm -f ./$(DEPDIR)/t-004.Po
-	-rm -f ./$(DEPDIR)/t-005.Po
-	-rm -f ./$(DEPDIR)/t-006.Po
+		-rm -f ./$(DEPDIR)/t_001-t-001.Po
+	-rm -f ./$(DEPDIR)/t_002-t-002.Po
+	-rm -f ./$(DEPDIR)/t_003-t-003.Po
+	-rm -f ./$(DEPDIR)/t_004-t-004.Po
+	-rm -f ./$(DEPDIR)/t_005-t-005.Po
+	-rm -f ./$(DEPDIR)/t_006-t-006.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/hawk/tools/Makefile.am b/hawk/tools/Makefile.am
index cad456cd..a72326d4 100644
--- a/hawk/tools/Makefile.am
+++ b/hawk/tools/Makefile.am
@@ -1,28 +1,28 @@
 AUTOMAKE_OPTIONS = nostdinc
 
-CPPFLAGS_ALL_COMMON = \
+CPPFLAGS_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_builddir)/../lib  \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
-
-LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(abs_builddir)/../lib -L$(libdir)
-
-CPPFLAGS_BIN_COMMON = $(CPPFLAGS_ALL_COMMON)
-LDFLAGS_BIN_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined
-LIBADD_BIN_COMMON =
+CFLAGS_COMMON = 
+LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) 
+LIBADD_COMMON = 
+DEPENDENCIES_COMMON = 
 
 bin_PROGRAMS = uni-case uni-prop
 
 uni_case_SOURCES = uni-case.c
-uni_case_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-uni_case_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-uni_case_LDADD = $(LIBADD_BIN_COMMON) 
-uni_case_DEPENDENCIES = 
+uni_case_CPPFLAGS = $(CPPFLAGS_COMMON)
+uni_case_CFLAGS = $(CFLAGS_COMMON)
+uni_case_LDFLAGS = $(LDFLAGS_COMMON)
+uni_case_LDADD = $(LIBADD_COMMON) 
+uni_case_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 
 uni_prop_SOURCES = uni-prop.c
-uni_prop_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-uni_prop_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-uni_prop_LDADD = $(LIBADD_BIN_COMMON) 
-uni_prop_DEPENDENCIES = 
+uni_prop_CPPFLAGS = $(CPPFLAGS_COMMON)
+uni_prop_CFLAGS = $(CFLAGS_COMMON)
+uni_prop_LDFLAGS = $(LDFLAGS_COMMON)
+uni_prop_LDADD = $(LIBADD_COMMON) 
+uni_prop_DEPENDENCIES = $(DEPENDENCIES_COMMON)
diff --git a/hawk/tools/Makefile.in b/hawk/tools/Makefile.in
index 71029c56..0706f0e2 100644
--- a/hawk/tools/Makefile.in
+++ b/hawk/tools/Makefile.in
@@ -117,13 +117,13 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 uni_case_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(uni_case_LDFLAGS) $(LDFLAGS) -o $@
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uni_case_CFLAGS) \
+	$(CFLAGS) $(uni_case_LDFLAGS) $(LDFLAGS) -o $@
 am_uni_prop_OBJECTS = uni_prop-uni-prop.$(OBJEXT)
 uni_prop_OBJECTS = $(am_uni_prop_OBJECTS)
 uni_prop_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(uni_prop_LDFLAGS) $(LDFLAGS) -o $@
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uni_prop_CFLAGS) \
+	$(CFLAGS) $(uni_prop_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -338,27 +338,29 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = nostdinc
-CPPFLAGS_ALL_COMMON = \
+CPPFLAGS_COMMON = \
 	-I$(abs_builddir) \
 	-I$(abs_builddir)/../lib  \
 	-I$(abs_srcdir) \
 	-I$(abs_srcdir)/../lib \
 	-I$(includedir)
 
-LDFLAGS_ALL_COMMON = -L$(abs_builddir) -L$(abs_builddir)/../lib -L$(libdir)
-CPPFLAGS_BIN_COMMON = $(CPPFLAGS_ALL_COMMON)
-LDFLAGS_BIN_COMMON = $(LDFLAGS_ALL_COMMON) -version-info 1:0:0 -no-undefined
-LIBADD_BIN_COMMON = 
+CFLAGS_COMMON = 
+LDFLAGS_COMMON = -L$(abs_builddir)/../lib -L$(libdir) 
+LIBADD_COMMON = 
+DEPENDENCIES_COMMON = 
 uni_case_SOURCES = uni-case.c
-uni_case_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-uni_case_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-uni_case_LDADD = $(LIBADD_BIN_COMMON) 
-uni_case_DEPENDENCIES = 
+uni_case_CPPFLAGS = $(CPPFLAGS_COMMON)
+uni_case_CFLAGS = $(CFLAGS_COMMON)
+uni_case_LDFLAGS = $(LDFLAGS_COMMON)
+uni_case_LDADD = $(LIBADD_COMMON) 
+uni_case_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 uni_prop_SOURCES = uni-prop.c
-uni_prop_CPPFLAGS = $(CPPFLAGS_ALL_COMMON)
-uni_prop_LDFLAGS = $(LDFLAGS_ALL_COMMON)
-uni_prop_LDADD = $(LIBADD_BIN_COMMON) 
-uni_prop_DEPENDENCIES = 
+uni_prop_CPPFLAGS = $(CPPFLAGS_COMMON)
+uni_prop_CFLAGS = $(CFLAGS_COMMON)
+uni_prop_LDFLAGS = $(LDFLAGS_COMMON)
+uni_prop_LDADD = $(LIBADD_COMMON) 
+uni_prop_DEPENDENCIES = $(DEPENDENCIES_COMMON)
 all: all-am
 
 .SUFFIXES:
@@ -490,32 +492,32 @@ am--depfiles: $(am__depfiles_remade)
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 uni_case-uni-case.o: uni-case.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_case_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uni_case-uni-case.o -MD -MP -MF $(DEPDIR)/uni_case-uni-case.Tpo -c -o uni_case-uni-case.o `test -f 'uni-case.c' || echo '$(srcdir)/'`uni-case.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_case_CPPFLAGS) $(CPPFLAGS) $(uni_case_CFLAGS) $(CFLAGS) -MT uni_case-uni-case.o -MD -MP -MF $(DEPDIR)/uni_case-uni-case.Tpo -c -o uni_case-uni-case.o `test -f 'uni-case.c' || echo '$(srcdir)/'`uni-case.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/uni_case-uni-case.Tpo $(DEPDIR)/uni_case-uni-case.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='uni-case.c' object='uni_case-uni-case.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_case_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uni_case-uni-case.o `test -f 'uni-case.c' || echo '$(srcdir)/'`uni-case.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_case_CPPFLAGS) $(CPPFLAGS) $(uni_case_CFLAGS) $(CFLAGS) -c -o uni_case-uni-case.o `test -f 'uni-case.c' || echo '$(srcdir)/'`uni-case.c
 
 uni_case-uni-case.obj: uni-case.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_case_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uni_case-uni-case.obj -MD -MP -MF $(DEPDIR)/uni_case-uni-case.Tpo -c -o uni_case-uni-case.obj `if test -f 'uni-case.c'; then $(CYGPATH_W) 'uni-case.c'; else $(CYGPATH_W) '$(srcdir)/uni-case.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_case_CPPFLAGS) $(CPPFLAGS) $(uni_case_CFLAGS) $(CFLAGS) -MT uni_case-uni-case.obj -MD -MP -MF $(DEPDIR)/uni_case-uni-case.Tpo -c -o uni_case-uni-case.obj `if test -f 'uni-case.c'; then $(CYGPATH_W) 'uni-case.c'; else $(CYGPATH_W) '$(srcdir)/uni-case.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/uni_case-uni-case.Tpo $(DEPDIR)/uni_case-uni-case.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='uni-case.c' object='uni_case-uni-case.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_case_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uni_case-uni-case.obj `if test -f 'uni-case.c'; then $(CYGPATH_W) 'uni-case.c'; else $(CYGPATH_W) '$(srcdir)/uni-case.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_case_CPPFLAGS) $(CPPFLAGS) $(uni_case_CFLAGS) $(CFLAGS) -c -o uni_case-uni-case.obj `if test -f 'uni-case.c'; then $(CYGPATH_W) 'uni-case.c'; else $(CYGPATH_W) '$(srcdir)/uni-case.c'; fi`
 
 uni_prop-uni-prop.o: uni-prop.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_prop_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uni_prop-uni-prop.o -MD -MP -MF $(DEPDIR)/uni_prop-uni-prop.Tpo -c -o uni_prop-uni-prop.o `test -f 'uni-prop.c' || echo '$(srcdir)/'`uni-prop.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_prop_CPPFLAGS) $(CPPFLAGS) $(uni_prop_CFLAGS) $(CFLAGS) -MT uni_prop-uni-prop.o -MD -MP -MF $(DEPDIR)/uni_prop-uni-prop.Tpo -c -o uni_prop-uni-prop.o `test -f 'uni-prop.c' || echo '$(srcdir)/'`uni-prop.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/uni_prop-uni-prop.Tpo $(DEPDIR)/uni_prop-uni-prop.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='uni-prop.c' object='uni_prop-uni-prop.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_prop_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uni_prop-uni-prop.o `test -f 'uni-prop.c' || echo '$(srcdir)/'`uni-prop.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_prop_CPPFLAGS) $(CPPFLAGS) $(uni_prop_CFLAGS) $(CFLAGS) -c -o uni_prop-uni-prop.o `test -f 'uni-prop.c' || echo '$(srcdir)/'`uni-prop.c
 
 uni_prop-uni-prop.obj: uni-prop.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_prop_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uni_prop-uni-prop.obj -MD -MP -MF $(DEPDIR)/uni_prop-uni-prop.Tpo -c -o uni_prop-uni-prop.obj `if test -f 'uni-prop.c'; then $(CYGPATH_W) 'uni-prop.c'; else $(CYGPATH_W) '$(srcdir)/uni-prop.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_prop_CPPFLAGS) $(CPPFLAGS) $(uni_prop_CFLAGS) $(CFLAGS) -MT uni_prop-uni-prop.obj -MD -MP -MF $(DEPDIR)/uni_prop-uni-prop.Tpo -c -o uni_prop-uni-prop.obj `if test -f 'uni-prop.c'; then $(CYGPATH_W) 'uni-prop.c'; else $(CYGPATH_W) '$(srcdir)/uni-prop.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/uni_prop-uni-prop.Tpo $(DEPDIR)/uni_prop-uni-prop.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='uni-prop.c' object='uni_prop-uni-prop.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_prop_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uni_prop-uni-prop.obj `if test -f 'uni-prop.c'; then $(CYGPATH_W) 'uni-prop.c'; else $(CYGPATH_W) '$(srcdir)/uni-prop.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uni_prop_CPPFLAGS) $(CPPFLAGS) $(uni_prop_CFLAGS) $(CFLAGS) -c -o uni_prop-uni-prop.obj `if test -f 'uni-prop.c'; then $(CYGPATH_W) 'uni-prop.c'; else $(CYGPATH_W) '$(srcdir)/uni-prop.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo