X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.am;h=75a29d57d2326772ddfe8cc643ee8c288136887c;hb=e802fe69a7551c4a84c4f57f68a6f2c8685969a1;hp=87fdd2b94dfbb089dfe72d5371e0c835e065b649;hpb=5d406a5f504148a9e494ea09b25d9b8d79543516;p=rrdtool.git diff --git a/src/Makefile.am b/src/Makefile.am index 87fdd2b..75a29d5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ # #ACLOCAL_M4 = $(top_srcdir)/config/aclocal.m4 #AUTOHEADER = @AUTOHEADER@ --localdir=$(top_srcdir)/config - +DEFS += -DMAKE_TIMESTAMP=\""$(shell date)"\" if USE_INSTALLED_libcgi CGI_LIB = -lcgi else @@ -67,7 +67,10 @@ RRD_C_FILES = \ rrd_gfx.c rrd_gfx.h \ rrd_afm.c rrd_afm_data.c \ getopt.h ntconfig.h parsetime.h \ - rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_hw.h rrd_rpncalc.h + rrd_format.h rrd_tool.h rrd_xport.h rrd.h rrd_hw.h rrd_rpncalc.h \ + rrd_tool.c \ + rrd_nan_inf.h fnv.h rrd_graph.h rrd_afm.h rrd_afm_data.h \ + rrd_is_thread_safe.h # Build two libraries. One is a public one that gets installed in # $prefix/lib. Libtool does not create an archive of the PIC compiled @@ -83,15 +86,20 @@ RRD_LIBS = \ $(PNG_LIB) \ $(ZLIB_LIB) -lib_LTLIBRARIES = librrd.la +lib_LTLIBRARIES = librrd.la librrd_th.la noinst_LTLIBRARIES = librrd_private.la -librrd_la_SOURCES = $(RRD_C_FILES) -librrd_private_la_SOURCES = $(RRD_C_FILES) +librrd_la_SOURCES = $(RRD_C_FILES) rrd_not_thread_safe.c +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_th_la_SOURCES = $(RRD_C_FILES) rrd_thread_safe.c +librrd_th_la_LIBADD = $(RRD_LIBS) -lpthread +librrd_th_la_LDFLAGS = -version-info 1:2:0 + + include_HEADERS = rrd.h librrd_private_la_LIBADD = $(RRD_LIBS) @@ -105,14 +113,14 @@ rrdcgi_LDADD = librrd.la rrdupdate_SOURCES = rrdupdate_LDADD = rrdupdate.o librrd.la - rrdupdate.c: rrd_update.c -ln -s rrd_update.c rrdupdate.c rrdupdate.o: rrdupdate.c $(COMPILE) -DSTANDALONE -c rrdupdate.c -rrdtool_SOURCES = rrd_tool.c +rrdtool_SOURCES = +rrdtool_DEPENDENCIES = rrd_tool.o rrdtool_LDADD = librrd.la EXTRA_DIST= rrdtool.dsp rrdtool.dsw