X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.Win32;h=39e5ededfaf21d3cb743e5edadcf2be93d0f3cf7;hb=0043267aa80eec6dbb4e406b52585c974f176a2f;hp=04e40373d2a905ca70df2fbc0698d90e031c2f17;hpb=db29017f473c15fa6b8f0490093f339fb3f5424e;p=rrdtool.git

diff --git a/src/Makefile.Win32 b/src/Makefile.Win32
index 04e4037..39e5ede 100644
--- a/src/Makefile.Win32
+++ b/src/Makefile.Win32
@@ -1,11 +1,6 @@
-# Gnu Makefile for Win32 target * 04-Jan-2006
+# Gnu Makefile for Win32 target * 29-Jan-2006
 # for use with MingW32 gcc or Metrowerks CodeWarrior compiler
-# use with: make -f Makefile.Win32 [all|clean|dist] [BINEXT=cgi]
-
-# What to build
-ifndef BINEXT
-BINEXT	= exe
-endif
+# use with: make -f Makefile.Win32 [all|clean|dist]
 
 DESCR	= Round Robin Database Tool
 COPYR	= Copyright (c) 1997-2006 by Tobias Oetiker
@@ -13,21 +8,27 @@ COPYR	= Copyright (c) 1997-2006 by Tobias Oetiker
 WWWURL	= http://www.rrdtool.org/
 ICON	= ../favicon.ico
 
+# Set the default font used in graphs.
+ifndef RRD_DEFAULT_FONT
+RRD_DEFAULT_FONT = "arial.ttf"
+#RRD_DEFAULT_FONT = "DejaVuSansMono-Roman.ttf"
+#RRD_DEFAULT_FONT = "VeraMono.ttf"
+endif
+
 # Vertical label angle: 90.0 (default) or 270.0
 RRDGRAPH_YLEGEND_ANGLE = 90.0
 
+# Set to one if you want to have piecharts.
+WITH_PIECHART = 1
+
 # Edit the path below to point to your install destination.
-INSTDIR	= c:/mrtg/rrd
+INSTDIR	= c:/rrdtool
 
 # Base for the lib sources
 ifndef LIBBASE
 LIBBASE	= ../..
 endif
-# All library code is statically linked to avoid problems with other lib NLMs. 
-# Edit the path below to point to your libgd sources or set environment var.
-ifndef LIBGD
-LIBGD	= $(LIBBASE)/gd-2.0.15
-endif
+# All library code is statically linked to avoid problems with other lib DLLs. 
 # Edit the path below to point to your libpng sources or set environment var.
 ifndef LIBPNG
 LIBPNG	= $(LIBBASE)/libpng-1.2.8
@@ -50,6 +51,9 @@ ifndef LIBCGI
 LIBCGI	= $(LIBBASE)/cgilib-0.5
 endif
 
+# whatever...
+NO_NULL_REALLOC = 1
+
 # The following line defines your compiler.
 ifdef METROWERKS
 	CC = mwcc
@@ -59,6 +63,9 @@ endif
 # RM	= rm -f
 CP	= cp -afv
 
+ZIP	= zip -qzR9
+ARCHIVE	= rrdtool-$(RRD_VERSION_STR)-w32.zip
+
 # must be equal to DEBUG or NDEBUG
 DB	= NDEBUG
 # DB	= DEBUG
@@ -81,18 +88,22 @@ ifeq ($(CC),mwcc)
 LD	= mwld
 RC	= mwwinrc
 LDFLAGS	= -nostdlib
+AR	= $(LD)
+ARFLAGS	= -type library -w nocmdline $(OBJS) -o
 LIBEXT	= lib
 LIBPATH	+= -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support"
 LDLIBS	+= -lkernel32.lib -luser32.lib
 LDLIBS	+= -lMSL_Runtime_x86.lib -lMSL_C_x86.lib -lMSL_Extras_x86.lib
 RCFLAGS	=
-CFLAGS	+= -gccinc -msgstyle gcc -inline off -opt nointrinsics -inst mmx -proc 586
+CFLAGS	+= -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 586
 CFLAGS	+= -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"
-#CFLAGS	+= -w on,nounused,nounusedexpr # -ansi strict
+CFLAGS	+= -w on,nounused,nounusedexpr # -ansi strict
 else
 LD	= gcc
 RC	= windres
 LDFLAGS	= -s
+AR	= ar
+ARFLAGS	= -cq
 LIBEXT	= a
 RCFLAGS	= -I rc -O coff -i
 CFLAGS	+= -fno-strict-aliasing -Wall -Wno-unused # -pedantic
@@ -102,18 +113,15 @@ ifndef COPYR
 	COPYR = Copyright (c) 2006 The Open Source Community.
 endif
 ifndef DESCR
-	DESCR = $(TARGET) Command Extension
+	DESCR = $(notdir $(@:.rc=)) Command Extension
 endif
 DESCR += - $(CC) build
 
-INCLUDES += -I. -I$(LIBGD) -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)
-ifeq ($(BINEXT),cgi)
-INCLUDES += -I$(LIBCGI)
-endif
+INCLUDES += -I. -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK) -I$(LIBCGI)
 
 CFLAGS += $(INCLUDES)
 
-vpath %.c . $(LIBGD) $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) $(LIBCGI)
+vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) $(LIBCGI)
 
 RRDLIBOBJS	= \
 	$(OBJDIR)/rrd_afm.o \
@@ -140,7 +148,7 @@ RRDLIBOBJS	= \
 	$(OBJDIR)/rrd_update.o \
 	$(OBJDIR)/rrd_version.o \
 	$(OBJDIR)/rrd_xport.o \
-	$(OBJDIR)/rrd_not_thread_safe.o \
+	$(OBJDIR)/rrd_thread_safe_nt.o \
 	$(EOLIST)
 
 XLIBOBJS	= \
@@ -153,20 +161,6 @@ XLIBOBJS	= \
 	$(OBJDIR)/strftime.o \
 	$(EOLIST)
 
-GD2LIBOBJS	= \
-	$(OBJDIR)/gd.o \
-	$(OBJDIR)/gd_io.o \
-	$(OBJDIR)/gd_io_dp.o \
-	$(OBJDIR)/gd_io_file.o \
-	$(OBJDIR)/gd_io_ss.o \
-	$(OBJDIR)/gd_png.o \
-	$(OBJDIR)/gd_ss.o \
-	$(OBJDIR)/gdcache.o \
-	$(OBJDIR)/gdfonts.o \
-	$(OBJDIR)/gdhelpers.o \
-	$(OBJDIR)/gdtables.o \
-	$(EOLIST)
-
 PNGLIBOBJS	= \
 	$(OBJDIR)/png.o \
 	$(OBJDIR)/pngerror.o \
@@ -210,7 +204,7 @@ ZLIBOBJS	+= \
 	$(EOLIST)
 endif
 
-CGIOBJS	= \
+CGILIBOBJS	= \
 	$(OBJDIR)/cgi.o \
 	$(OBJDIR)/cookies.o \
 	$(EOLIST)
@@ -218,33 +212,42 @@ CGIOBJS	= \
 ARTLIBOBJS	= \
 	$(patsubst $(LIBART)/libart_lgpl/%.c,$(OBJDIR)/%.o,$(wildcard $(LIBART)/libart_lgpl/art_*.c))
 
-OBJS	= $(RRDLIBOBJS) $(XLIBOBJS) $(GD2LIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)
-
-ifeq ($(BINEXT),cgi)
-OBJS	+= $(CGIOBJS) $(OBJDIR)/rrd_cgi.o
-TARGET	= rrdcgi
-else
-OBJS	+= $(OBJDIR)/rrd_tool.o
-TARGET	= rrdtool
-endif
+OBJS	:= $(RRDLIBOBJS) $(XLIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)
+OBJCGI	:= $(OBJS) $(CGILIBOBJS) $(OBJDIR)/rrd_cgi.o
+OBJTOOL	:= $(OBJS) $(OBJDIR)/rrd_tool.o
 
 LDLIBS	+= $(LIBFT2)/objs/freetype.$(LIBEXT)
 
 
-all: $(OBJDIR) config.h $(OBJDIR)/$(TARGET).$(BINEXT)
+all: rrdtool rrdcgi
 
-dist: all
-	-$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
-	-$(RM) $(OBJDIR)/$(TARGET).def $(OBJDIR)/$(TARGET).res
+rrdtool: $(OBJDIR) config.h $(OBJDIR)/rrdtool.exe
+rrdcgi: $(OBJDIR) config.h $(OBJDIR)/rrdcgi.exe
+librrd: $(OBJDIR) config.h $(OBJDIR)/librrd.$(LIBEXT)
+
+dist: all $(OBJDIR)/readme.txt
+	-$(RM) $(OBJDIR)/*.o $(OBJDIR)/*.map $(OBJDIR)/*.ncv
+	-$(RM) $(OBJDIR)/*.def $(OBJDIR)/*.res $(OBJDIR)/*.rc
+	-$(RM) $(OBJDIR)/version.inc
+	@-$(CP) ../CHANGES $(OBJDIR)
+	@-$(CP) ../COPYING $(OBJDIR)
+	@-$(CP) ../COPYRIGHT $(OBJDIR)
+	@-$(CP) ../NEWS $(OBJDIR)
+	@-$(CP) ../README $(OBJDIR)
+	@echo Creating $(ARCHIVE)
+	@$(ZIP) $(ARCHIVE) $(OBJDIR)/* < $(OBJDIR)/readme.txt
 
 install: all
 	@[ -d $(INSTDIR) ] || mkdir $(INSTDIR)
-	@$(CP) $(TARGET).$(BINEXT) $(INSTDIR)
+	@$(CP) $(OBJDIR)/*.exe $(INSTDIR)
 
 clean:
 	-$(RM) -r $(OBJDIR)
 	-$(RM) config.h
 
+cleandist: clean
+	-$(RM) $(ARCHIVE)
+
 $(OBJDIR):
 	@mkdir $(OBJDIR)
 
@@ -256,11 +259,21 @@ $(OBJDIR)/%.o: %.c
 	@echo Compiling $<
 	@$(CC) $(CFLAGS) -c $< -o $@
 
-$(OBJDIR)/$(TARGET).$(BINEXT): $(OBJS) $(OBJDIR)/$(TARGET).res
+$(OBJDIR)/rrdcgi.exe: $(OBJCGI) $(OBJDIR)/rrdcgi.res
 	@echo Linking $@
 	@-$(RM) $@
 	@$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)
 
+$(OBJDIR)/rrdtool.exe: $(OBJTOOL) $(OBJDIR)/rrdtool.res
+	@echo Linking $@
+	@-$(RM) $@
+	@$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)
+
+$(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
+	@echo Creating $@
+	@-$(RM) $@
+	@$(AR) $(ARFLAGS) $@ $^
+
 $(OBJDIR)/%.res: $(OBJDIR)/%.rc
 	@echo Creating $@
 	@$(RC) $(RCFLAGS) $< -o $@
@@ -281,13 +294,13 @@ $(OBJDIR)/%.rc: Makefile.Win32 $(OBJDIR)/version.inc
 	@echo     BEGIN >> $@
 	@echo       VALUE "LegalCopyright","$(COPYR)\0" >> $@
 #	@echo       VALUE "CompanyName","$(COMPANY)\0" >> $@
-	@echo       VALUE "ProductName","$(TARGET).$(BINEXT)\0" >> $@
+	@echo       VALUE "ProductName","$(notdir $(@:.rc=.exe))\0" >> $@
 	@echo       VALUE "ProductVersion","$(RRD_VERSION_STR)\0" >> $@
 	@echo       VALUE "License","Released under GPL.\0" >> $@
 	@echo       VALUE "FileDescription","$(DESCR)\0" >> $@
 	@echo       VALUE "FileVersion","$(RRD_VERSION_STR)\0" >> $@
-	@echo       VALUE "InternalName","$(TARGET)\0" >> $@
-	@echo       VALUE "OriginalFilename","$(TARGET).$(BINEXT)\0" >> $@
+	@echo       VALUE "InternalName","$(notdir $(@:.rc=))\0" >> $@
+	@echo       VALUE "OriginalFilename","$(notdir $(@:.rc=.exe))\0" >> $@
 ifdef WWWURL
 	@echo       VALUE "WWW","$(WWWURL)\0" >> $@
 endif
@@ -342,7 +355,7 @@ config.h: Makefile.Win32 $(OBJDIR)/version.inc
 	@echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@
 	@echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@
 	@echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@
-	@echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
+#	@echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@
@@ -353,8 +366,25 @@ config.h: Makefile.Win32 $(OBJDIR)/version.inc
 	@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@
 	@echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@
+ifdef NO_NULL_REALLOC
+	@echo $(DL)#define NO_NULL_REALLOC 1$(DL) >> $@
+	@echo $(DL)#define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))$(DL) >> $@
+else
 	@echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@
+endif
 	@echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@
-	@echo $(DL)#define RRD_DEFAULT_FONT "arial.ttf"$(DL) >> $@
+	@echo $(DL)#define RRD_DEFAULT_FONT $(RRD_DEFAULT_FONT)$(DL) >> $@
+	@echo $(DL)#define strftime strftime_$(DL) >> $@
+ifdef WITH_PIECHART
+	@echo $(DL)#define WITH_PIECHART 1$(DL) >> $@
+endif
+
+$(OBJDIR)/readme.txt: Makefile.Win32
+	@echo Creating $@
+	@echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@
+	@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) >> $@