X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.Win32;h=c9230d4f650d2dfa7946ff0d00cee41ffdd88f26;hb=9e6db622e8756105c1322481b34650ecbe15da1a;hp=c37aa00be033493299bec11d4da0cfa9cf2584e6;hpb=fe4b39587f4ac54acfe33723ff6b1a39c84d357a;p=rrdtool.git

diff --git a/src/Makefile.Win32 b/src/Makefile.Win32
index c37aa00..c9230d4 100644
--- a/src/Makefile.Win32
+++ b/src/Makefile.Win32
@@ -1,4 +1,4 @@
-# Gnu Makefile for Win32 target * 19-May-2006
+# Gnu Makefile for Win32 target * 11-Jul-2006
 # for use with MingW32 gcc or Metrowerks CodeWarrior compiler
 # use with: make -f Makefile.Win32 [all|clean|dist|distclean]
 
@@ -48,10 +48,6 @@ endif
 ifndef ZLIBSDK
 ZLIBSDK	= $(LIBBASE)/zlib-1.2.3
 endif
-# Edit the path below to point to your zlib sources or set environment var.
-ifndef LIBCGI
-LIBCGI	= $(LIBBASE)/cgilib-0.5
-endif
 
 # Edit the path below to point to your distribution folder.
 ifndef DISTDIR
@@ -124,11 +120,11 @@ ifndef DESCR
 endif
 DESCR += - $(CC) build
 
-INCLUDES += -I. -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK) -I$(LIBCGI)
+INCLUDES += -I. -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK) 
 
 CFLAGS += $(INCLUDES)
 
-vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) $(LIBCGI)
+vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) 
 
 RRDLIBOBJS	= \
 	$(OBJDIR)/rrd_afm.o \
@@ -211,16 +207,11 @@ ZLIBOBJS	+= \
 	$(EOLIST)
 endif
 
-CGILIBOBJS	= \
-	$(OBJDIR)/cgi.o \
-	$(OBJDIR)/cookies.o \
-	$(EOLIST)
-
 ARTLIBOBJS	= \
 	$(patsubst $(LIBART)/libart_lgpl/%.c,$(OBJDIR)/%.o,$(wildcard $(LIBART)/libart_lgpl/art_*.c))
 
 OBJS	:= $(RRDLIBOBJS) $(XLIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)
-OBJCGI	:= $(OBJS) $(CGILIBOBJS) $(OBJDIR)/rrd_cgi.o
+OBJCGI	:= $(OBJS) $(OBJDIR)/rrd_cgi.o
 OBJTOOL	:= $(OBJS) $(OBJDIR)/rrd_tool.o
 
 LDLIBS	+= $(LIBFT2)/objs/freetype.$(LIBEXT)
@@ -301,7 +292,9 @@ $(OBJDIR)/%.rc: Makefile.Win32 $(OBJDIR)/version.inc
 	@echo     BLOCK "040904E4" >> $@
 	@echo     BEGIN >> $@
 	@echo       VALUE "LegalCopyright","$(COPYR)\0" >> $@
-#	@echo       VALUE "CompanyName","$(COMPANY)\0" >> $@
+ifdef COMPANY
+	@echo       VALUE "CompanyName","$(COMPANY)\0" >> $@
+endif
 	@echo       VALUE "ProductName","$(notdir $(@:.rc=.exe))\0" >> $@
 	@echo       VALUE "ProductVersion","$(RRD_VERSION_STR)\0" >> $@
 	@echo       VALUE "License","Released under GPL.\0" >> $@
@@ -309,9 +302,7 @@ $(OBJDIR)/%.rc: Makefile.Win32 $(OBJDIR)/version.inc
 	@echo       VALUE "FileVersion","$(RRD_VERSION_STR)\0" >> $@
 	@echo       VALUE "InternalName","$(notdir $(@:.rc=))\0" >> $@
 	@echo       VALUE "OriginalFilename","$(notdir $(@:.rc=.exe))\0" >> $@
-ifdef WWWURL
 	@echo       VALUE "WWW","$(WWWURL)\0" >> $@
-endif
 	@echo     END >> $@
 	@echo   END >> $@
 	@echo   BLOCK "VarFileInfo" >> $@
@@ -393,6 +384,6 @@ $(DISTDIR)/readme.txt: Makefile.Win32
 	@echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@
 	@echo $(DL)Please download the complete RRDTool package for$(DL) >> $@
 	@echo $(DL)any further documentation:$(DL) >> $@
-	@echo $(DL)http://www.rrdtool.org/$(DL) >> $@
+	@echo $(DL)$(WWWURL)$(DL) >> $@