make the threading work and compile, fix linking to libpng

and update the timestaps int the files

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@184 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/libraries/libpng-1.2.0/Makefile.am b/libraries/libpng-1.2.0/Makefile.am
index 457f674..6b70493 100644 (file)
--- a/libraries/libpng-1.2.0/Makefile.am
+++ b/libraries/libpng-1.2.0/Makefile.am
@@ -2,7 +2,7 @@
 
 ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
 
 
 ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
 

-INCLUDES = -I$(top_srcdir)/$(ZLIB_LIB_DIR)
+INCLUDES = -I$(top_srcdir)/libraries/$(ZLIB_LIB_DIR)

 
 EXTRA_DIST= ANNOUNCE CHANGES INSTALL KNOWNBUG README README.rrdtool \
             TODO Y2KINFO example.c libpng.3 \
 
 EXTRA_DIST= ANNOUNCE CHANGES INSTALL KNOWNBUG README README.rrdtool \
             TODO Y2KINFO example.c libpng.3 \

diff --git a/src/Makefile.am b/src/Makefile.am
index 4bf66ac..4a93f32 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,7 +89,7 @@ lib_LTLIBRARIES           = librrd.la librrd_th.la
 noinst_LTLIBRARIES        = librrd_private.la
 
 librrd_la_SOURCES         = $(RRD_C_FILES) rrd_not_thread_safe.c
 noinst_LTLIBRARIES        = librrd_private.la
 
 librrd_la_SOURCES         = $(RRD_C_FILES) rrd_not_thread_safe.c

-librrd_private_la_SOURCES = $(RRD_C_FILES)
+librrd_private_la_SOURCES = $(RRD_C_FILES) rrd_not_thread_safe.c

 
 librrd_la_LIBADD          = $(RRD_LIBS)
 librrd_la_LDFLAGS         = -version-info 1:2:0
 
 librrd_la_LIBADD          = $(RRD_LIBS)
 librrd_la_LDFLAGS         = -version-info 1:2:0