fix win32 distributables

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

diff --git a/Makefile.am b/Makefile.am
index 1961ef2..20b2e0a 100644 (file)
--- a/Makefile.am
+++ b/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 \
 
  # 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
 
 
 CLEANFILES = config.cache
 

diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index 495a313..340ea15 100644 (file)
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -63,13 +63,6 @@
  * Now for some includes..
  */
 /* {{{ */
  * 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"
 
 #include "rrd_tool.h"
 #include "rrd_client.h"