X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=win32%2FMakefile;fp=win32%2FMakefile;h=5c086a580d058bead5052a714a492e089f032e4a;hp=7ed9c7694a7a68d174a687e5745d2a2220c70241;hb=58f824a51a3d59c54d24dd2e2a96afda4493b4b4;hpb=d11290cf10bd321be4f353cf5f4dce0e2ca289ee

diff --git a/win32/Makefile b/win32/Makefile
index 7ed9c76..5c086a5 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -229,9 +229,9 @@ LDLIBS	+= $(LIBFT2)/objs/freetype.$(LIBEXT)
 
 all: rrdtool rrdcgi
 
-rrdtool: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/rrdtool.exe
-rrdcgi: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/rrdcgi.$(CGIEXT)
-librrd: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/librrd.$(LIBEXT)
+rrdtool: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/rrdtool.exe
+rrdcgi: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/rrdcgi.$(CGIEXT)
+librrd: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/librrd.$(LIBEXT)
 
 dist: all $(DISTDIR) $(DISTDIR)/readme.txt
 #	@-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DISTDIR)
@@ -251,7 +251,7 @@ dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt
 	@-mkdir $(DEVLDIR)$(DS)lib
 	@-mkdir $(DEVLDIR)$(DS)src
 	@-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DEVLDIR)/lib
-	@-$(CP) $(PROOT)/config.h $(DEVLDIR)/include
+	@-$(CP) $(PROOT)/rrd_config.h $(DEVLDIR)/include
 	@-$(CP) $(PROOT)/src/rrd.h $(DEVLDIR)/include
 	@-$(CP) $(PROOT)/src/*.ttf $(DEVLDIR)/src
 	@-$(CP) $(PROOT)/CHANGES $(DEVLDIR)
@@ -264,7 +264,7 @@ dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt
 
 clean:
 	-$(RM) -r $(OBJDIR)
-	-$(RM) $(PROOT)/config.h
+	-$(RM) $(PROOT)/rrd_config.h
 
 distclean: clean
 	-$(RM) -r $(DISTDIR)
@@ -347,15 +347,17 @@ ifdef ICON
 	@echo 10 ICON DISCARDABLE "$(ICON)" >> $@
 endif
 
-$(PROOT)/config.h: Makefile $(OBJDIR)/version.inc
+$(PROOT)/rrd_config.h: Makefile $(OBJDIR)/version.inc
 	@echo Creating $@
-	@echo $(DL)/* $@ for Win32 target.$(DL) > $@
+	@echo $(DL)/* $(notdir $@) for Win32 target.$(DL) > $@
 	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
 	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
 	@echo $(DL)*/$(DL) >> $@
 	@echo $(DL)#ifndef WIN32$(DL) >> $@
-	@echo $(DL)#error This config.h is created for Win32 platform!$(DL) >> $@
+	@echo $(DL)#error This $(notdir $@) is created for Win32 platform!$(DL) >> $@
 	@echo $(DL)#endif$(DL) >> $@
+	@echo $(DL)#ifndef RRD_CONFIG_H$(DL) >> $@
+	@echo $(DL)#define RRD_CONFIG_H$(DL) >> $@
 	@echo $(DL)#define OS "i586-pc-Win32"$(DL) >> $@
 	@echo $(DL)#define PACKAGE_VERSION "$(RRD_VERSION_STR)"$(DL) >> $@
 	@echo $(DL)#define PACKAGE_BUGREPORT "tobi@oetiker.ch"$(DL) >> $@
@@ -415,6 +417,7 @@ endif
 ifdef WITH_PIECHART
 	@echo $(DL)#define WITH_PIECHART 1$(DL) >> $@
 endif
+	@echo $(DL)#endif /* RRD_CONFIG_H */$(DL) >> $@
 
 $(DISTDIR)/readme.txt: Makefile
 	@echo Creating $@