From 00e3eda2c5db59d79fd091438c1bc34c7eea9cb3 Mon Sep 17 00:00:00 2001 From: oetiker Date: Fri, 16 Dec 2011 07:48:48 +0000 Subject: [PATCH] fix win32 distributables git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@2239 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/Makefile.am | 13 ++++++------- program/src/rrd_daemon.c | 7 ------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/program/Makefile.am b/program/Makefile.am index 1961ef23..20b2e0ab 100644 --- a/program/Makefile.am +++ b/program/Makefile.am @@ -9,13 +9,12 @@ SUBDIRS = po src examples doc bindings # the following files are not mentioned in any other Makefile EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \ - rrdtool.spec favicon.ico win32/Makefile win32/config.h autogen.sh \ - win32/rrd.dsp win32/rrd.sln win32/rrd.vcproj libtool \ - win32/rrd_config.h.msvc win32/rrdlib.vcproj win32/rrdtool.dsp \ - win32/rrdtool.dsw win32/rrdtool.vcproj netware/Makefile \ - etc/rrdcached-default etc/rrdcached-init - - + rrdtool.spec favicon.ico autogen.sh \ + libtool \ + netware/Makefile \ + etc/rrdcached-default etc/rrdcached-init \ + win32/Makefile win32/config.h win32/rrdlib.vcproj win32/rrdtool.vcproj win32/rrdupdate.vcproj \ + win32/README win32/rrd.sln win32/rrdtool.sln win32/rrdupdate.sln CLEANFILES = config.cache diff --git a/program/src/rrd_daemon.c b/program/src/rrd_daemon.c index 495a313d..340ea153 100644 --- a/program/src/rrd_daemon.c +++ b/program/src/rrd_daemon.c @@ -63,13 +63,6 @@ * Now for some includes.. */ /* {{{ */ -#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H) -#include "../win32/config.h" -#else -#ifdef HAVE_CONFIG_H -#include "../rrd_config.h" -#endif -#endif #include "rrd_tool.h" #include "rrd_client.h" -- 2.30.2