prepare for the release of rrdtool-1.2.14

[rrdtool.git] / src / Makefile.Win32

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