Fix make dist-bzip2

Makefile.am

@@ -1,39 +1,40 @@
 ## Process this file with automake to generate Makefile.in
-AUTOMAKE_OPTIONS        = foreign nostdinc
+AUTOMAKE_OPTIONS = foreign nostdinc
+ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS             = -I. -I$(top_srcdir)
-AM_LD                   = $(CXX)
+AM_CPPFLAGS = -I. -I$(top_srcdir)
+AM_LD = $(CC)
 
 if DEBUG
   DEBUG_CFLAGS = -DDEBUG
 endif
 
-AM_CFLAGS               = -pedantic -Wall $(DEBUG_CFLAGS)
-AM_CXXFLAGS             = -Wall $(DEBUG_CFLAGS)
-#AM_CFLAGS               = -ansi -pedantic -Werror -Wall -D_POSIX_C_SOURCE=199309 -DVERSION=$(VERSION) $(DEBUG_CFLAGS)
+AM_CFLAGS = -pedantic -Wall $(DEBUG_CFLAGS)
+#AM_CFLAGS = -ansi -pedantic -Werror -Wall -D_POSIX_C_SOURCE=199309 -DVERSION=$(VERSION) $(DEBUG_CFLAGS)
 
-bin_PROGRAMS            =
-lib_LTLIBRARIES         =
-lib_LIBRARIES           =
-nobase_include_HEADERS  =
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+lib_LIBRARIES =
+nobase_include_HEADERS =
 
-EXTRA_DIST              =  \
-    bin/module.am          \
-    clish/module.am        \
-    lub/module.am          \
-    tinyrl/module.am       \
-    tinyxml/module.am      \
-    konf/module.am         \
-    doxygen.config         \
-    clish.xsd              \
-    LICENCE                \
-    README                 \
-    CHANGES                \
-    ISSUES
+EXTRA_DIST = \
+	bin/module.am \
+	clish/module.am \
+	lub/module.am \
+	tinyrl/module.am \
+	tinyxml/module.am \
+	konf/module.am \
+	contrib \
+	xml-examples \
+	clish.xsd \
+	LICENCE \
+	README \
+	CHANGES \
+	ISSUES
 
-include $(top_srcdir)/bin/module.am
-include $(top_srcdir)/clish/module.am
 include $(top_srcdir)/lub/module.am
 include $(top_srcdir)/tinyrl/module.am
 include $(top_srcdir)/tinyxml/module.am
 include $(top_srcdir)/konf/module.am
+include $(top_srcdir)/clish/module.am
+include $(top_srcdir)/bin/module.am

clish/module.am

@@ -14,6 +14,11 @@ libclish_la_LIBADD = \
 	libtinyrl.la \
 	libtinyxml.la \
 	libkonf.la
+libclish_la_DEPENDENCIES = \
+	liblub.la \
+	libtinyrl.la \
+	libtinyxml.la \
+	libkonf.la
 
 nobase_include_HEADERS += \
 	clish/types.h \

konf/module.am

@@ -2,6 +2,7 @@
 lib_LTLIBRARIES += libkonf.la
 libkonf_la_SOURCES =
 libkonf_la_LIBADD = liblub.la
+libkonf_la_DEPENDENCIES = liblub.la
 
 nobase_include_HEADERS += \
 	konf/tree.h \

lub/list/module.am

@@ -1,2 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-liblub_la_SOURCES += lub/list/list.c
+liblub_la_SOURCES += \
+	lub/list/list.c \
+	lub/list/private.h
+

tinyrl/module.am

@@ -1,6 +1,7 @@
 ## Process this file with automake to generate Makefile.in
 lib_LTLIBRARIES += libtinyrl.la
 libtinyrl_la_LIBADD = liblub.la
+libtinyrl_la_DEPENDENCIES = liblub.la
 
 libtinyrl_la_SOURCES = \
 	tinyrl/tinyrl.c \