Support make with parallel building. Update configure infrastructure

git-svn-id: https://klish.googlecode.com/svn/trunk@327 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb

Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -86,6 +86,7 @@ DIST_COMMON = README $(am__configure_deps) $(nobase_include_HEADERS) \
 	aux_scripts/depcomp aux_scripts/install-sh \
 	aux_scripts/ltmain.sh aux_scripts/missing
 @TCL_TRUE@am__append_1 = bin/tclish@TCL_VERSION@
+#    @LUBHEAP_LIBS@
 @LUBHEAP_TRUE@am__append_2 = bin/lubheap
 @LUBHEAP_TRUE@am__append_3 = lub/heap/cache.c lub/heap/cache.h \
 @LUBHEAP_TRUE@	lub/heap/cache_bucket.c lub/heap/context.c \
@@ -439,17 +440,18 @@ libtinyxml_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_bin_clish_OBJECTS = bin/clish.$(OBJEXT)
 bin_clish_OBJECTS = $(am_bin_clish_OBJECTS)
-bin_clish_DEPENDENCIES = libclish.la
+bin_clish_DEPENDENCIES = libclish.la libkonf.la libtinyrl.la \
+	libtinyxml.la liblub.la
 am_bin_konf_OBJECTS = bin/konf.$(OBJEXT)
 bin_konf_OBJECTS = $(am_bin_konf_OBJECTS)
-bin_konf_DEPENDENCIES =
+bin_konf_DEPENDENCIES = libkonf.la liblub.la
 am_bin_konfd_OBJECTS = bin/konfd.$(OBJEXT)
 bin_konfd_OBJECTS = $(am_bin_konfd_OBJECTS)
-bin_konfd_DEPENDENCIES =
+bin_konfd_DEPENDENCIES = libkonf.la liblub.la
 am__bin_lubheap_SOURCES_DIST = bin/lubheap.c
 @LUBHEAP_TRUE@am_bin_lubheap_OBJECTS = bin/lubheap.$(OBJEXT)
 bin_lubheap_OBJECTS = $(am_bin_lubheap_OBJECTS)
-bin_lubheap_DEPENDENCIES =
+@LUBHEAP_TRUE@bin_lubheap_DEPENDENCIES = liblub.la
 am__bin_tclish@TCL_VERSION@_SOURCES_DIST = bin/tclish.cpp \
 	bin/tclish_fini_callback.c bin/tclish_init_callback.c \
 	bin/tclish_script_callback.c bin/tclish_show_result.c
@@ -460,7 +462,8 @@ am__bin_tclish@TCL_VERSION@_SOURCES_DIST = bin/tclish.cpp \
 @TCL_TRUE@	bin/tclish_show_result.$(OBJEXT)
 bin_tclish@TCL_VERSION@_OBJECTS =  \
 	$(am_bin_tclish@TCL_VERSION@_OBJECTS)
-@TCL_TRUE@bin_tclish@TCL_VERSION@_DEPENDENCIES = libclish.la
+@TCL_TRUE@bin_tclish@TCL_VERSION@_DEPENDENCIES = libclish.la \
+@TCL_TRUE@	libkonf.la libtinyrl.la libtinyxml.la liblub.la
 am_test_bintree_OBJECTS = test/bintree.$(OBJEXT)
 test_bintree_OBJECTS = $(am_test_bintree_OBJECTS)
 test_bintree_DEPENDENCIES = liblub.la
@@ -594,6 +597,7 @@ LUBHEAP_LIBS = @LUBHEAP_LIBS@
 LUB_CFLAGS = @LUB_CFLAGS@
 LUB_LIBS = @LUB_LIBS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -630,6 +634,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -663,7 +668,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -734,23 +738,23 @@ EXTRA_DIST = bin/module.am clish/module.am lub/module.am \
 bin_clish_SOURCES = bin/clish.cpp
 bin_clish_LDADD = \
     libclish.la    \
-    @KONF_LIBS@ \
-    @TINYRL_LIBS@  \
-    @TINYXML_LIBS@ \
-    @LUBHEAP_LIBS@ \
-    @LUB_LIBS@     \
+    libkonf.la     \
+    libtinyrl.la   \
+    libtinyxml.la  \
+    liblub.la      \
     @PTHREAD_LIBS@ \
     @BFD_LIBS@
 
+#    @LUBHEAP_LIBS@
 bin_konfd_SOURCES = bin/konfd.c
 bin_konfd_LDADD = \
-    @KONF_LIBS@ \
-    @LUB_LIBS@
+    libkonf.la     \
+    liblub.la
 
 bin_konf_SOURCES = bin/konf.c
 bin_konf_LDADD = \
-    @KONF_LIBS@ \
-    @LUB_LIBS@
+    libkonf.la    \
+    liblub.la
 
 @TCL_TRUE@bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
 @TCL_TRUE@    bin/tclish_fini_callback.c   \
@@ -760,19 +764,18 @@ bin_konf_LDADD = \
 
 @TCL_TRUE@bin_tclish@TCL_VERSION@_LDADD = \
 @TCL_TRUE@    libclish.la                   \
-@TCL_TRUE@    @KONF_LIBS@                   \
-@TCL_TRUE@    @TINYRL_LIBS@                 \
-@TCL_TRUE@    @TINYXML_LIBS@                \
+@TCL_TRUE@    libkonf.la                    \
+@TCL_TRUE@    libtinyrl.la                  \
+@TCL_TRUE@    libtinyxml.la                 \
+@TCL_TRUE@    liblub.la                     \
 @TCL_TRUE@    @TCL_LIBS@                    \
-@TCL_TRUE@    @LUBHEAP_LIBS@                \
-@TCL_TRUE@    @LUB_LIBS@                    \
 @TCL_TRUE@    @PTHREAD_LIBS@                \
 @TCL_TRUE@    @BFD_LIBS@
 
 @LUBHEAP_TRUE@bin_lubheap_SOURCES = bin/lubheap.c
 @LUBHEAP_TRUE@bin_lubheap_LDADD = \
+@LUBHEAP_TRUE@    liblub.la         \
 @LUBHEAP_TRUE@    @LUBHEAP_LIBS@    \
-@LUBHEAP_TRUE@    @LUB_LIBS@        \
 @LUBHEAP_TRUE@    @PTHREAD_LIBS@    \
 @LUBHEAP_TRUE@    @BFD_LIBS@
 
@@ -2817,7 +2820,8 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -2861,17 +2865,17 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac

bin/module.am

@@ -4,23 +4,23 @@ bin_PROGRAMS += bin/clish bin/konfd bin/konf
 bin_clish_SOURCES = bin/clish.cpp
 bin_clish_LDADD  = \
     libclish.la    \
-    @KONF_LIBS@ \
-    @TINYRL_LIBS@  \
-    @TINYXML_LIBS@ \
-    @LUBHEAP_LIBS@ \
-    @LUB_LIBS@     \
+    libkonf.la     \
+    libtinyrl.la   \
+    libtinyxml.la  \
+    liblub.la      \
     @PTHREAD_LIBS@ \
     @BFD_LIBS@
+#    @LUBHEAP_LIBS@
 
 bin_konfd_SOURCES = bin/konfd.c
 bin_konfd_LDADD  = \
-    @KONF_LIBS@ \
-    @LUB_LIBS@
+    libkonf.la     \
+    liblub.la
 
 bin_konf_SOURCES = bin/konf.c
 bin_konf_LDADD  = \
-    @KONF_LIBS@ \
-    @LUB_LIBS@
+    libkonf.la    \
+    liblub.la
 
 ## If TCL is enabled
 if TCL
@@ -32,24 +32,25 @@ if TCL
     bin/tclish_script_callback.c \
     bin/tclish_show_result.c
 
-  bin_tclish@TCL_VERSION@_LDADD   = \
+  bin_tclish@TCL_VERSION@_LDADD = \
     libclish.la                   \
-    @KONF_LIBS@                   \
-    @TINYRL_LIBS@                 \
-    @TINYXML_LIBS@                \
+    libkonf.la                    \
+    libtinyrl.la                  \
+    libtinyxml.la                 \
+    liblub.la                     \
     @TCL_LIBS@                    \
-    @LUBHEAP_LIBS@                \
-    @LUB_LIBS@                    \
     @PTHREAD_LIBS@                \
     @BFD_LIBS@
+#    @LUBHEAP_LIBS@
+
 endif
 
 if LUBHEAP
   bin_PROGRAMS += bin/lubheap
   bin_lubheap_SOURCES = bin/lubheap.c
   bin_lubheap_LDADD = \
+    liblub.la         \
     @LUBHEAP_LIBS@    \
-    @LUB_LIBS@        \
     @PTHREAD_LIBS@    \
     @BFD_LIBS@
 endif