-# Gnu Makefile for Win32 target * 20-Aug-2005\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]\r
+# use with: make -f Makefile.Win32 [all|clean|dist|distclean]\r
\r
-SOURCE = rrd_tool\r
-#SOURCE = rrd_cgi\r
-TARGET = $(subst _,,$(SOURCE))\r
-#DESCR = Round Robin Database Tool $(RRD_VERSION_STR)\r
DESCR = Round Robin Database Tool\r
-COPYR = Copyright (c) 1997-2005 by Tobias Oetiker\r
+COPYR = Copyright (c) 1997-2006 by Tobias Oetiker\r
#WWWURL = http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/\r
WWWURL = http://www.rrdtool.org/\r
+ICON = ../favicon.ico\r
\r
-# Edit the path below to point to your install destination.\r
-# INSTDIR = /mnt/sys/mrtg/rrd\r
-INSTDIR = c:/mrtg/rrd\r
+# Set the default font used in graphs.\r
+ifndef RRD_DEFAULT_FONT\r
+#RRD_DEFAULT_FONT = "arial.ttf"\r
+#RRD_DEFAULT_FONT = "DejaVuSansMono-Roman.ttf"\r
+RRD_DEFAULT_FONT = "VeraMono.ttf"\r
+endif\r
+\r
+# Vertical label angle: 90.0 (default) or 270.0\r
+RRDGRAPH_YLEGEND_ANGLE = 90.0\r
+\r
+# Set to one if you want to have piecharts.\r
+WITH_PIECHART = 1\r
+\r
+# Set the extension used for rrdcgi.\r
+ifndef CGIEXT\r
+CGIEXT = exe\r
+endif\r
\r
# Base for the lib sources\r
ifndef LIBBASE\r
-LIBBASE = d:/projects/cw\r
-endif\r
-# All library code is statically linked to avoid problems with other lib NLMs. \r
-# Edit the path below to point to your libgd sources or set environment var.\r
-ifndef LIBGD\r
-LIBGD = $(LIBBASE)/gd-2.0.15\r
+LIBBASE = ../..\r
endif\r
+# All library code is statically linked to avoid problems with other lib DLLs. \r
# Edit the path below to point to your libpng sources or set environment var.\r
ifndef LIBPNG\r
-LIBPNG = $(LIBBASE)/libpng-1.2.8\r
+LIBPNG = $(LIBBASE)/libpng-1.2.10\r
endif\r
# Edit the path below to point to your freetype sources or set environment var.\r
ifndef LIBFT2\r
-#LIBFT2 = $(LIBBASE)/freetype-2.1.9\r
-LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.1.9\r
+#LIBFT2 = $(LIBBASE)/freetype-2.1.10\r
+LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.1.10\r
endif\r
# Edit the path below to point to your freetype sources or set environment var.\r
ifndef LIBART\r
-LIBART = $(LIBBASE)/libart_lgpl-2.3.3\r
+LIBART = $(LIBBASE)/libart_lgpl-2.3.17\r
endif\r
# Edit the path below to point to your zlib sources or set environment var.\r
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.4\r
-LIBCGI = d:/rrdtool-1.0.50/cgilib-0.4\r
+\r
+# Edit the path below to point to your distribution folder.\r
+ifndef DISTDIR\r
+DISTDIR = rrdtool-$(RRD_VERSION_STR)-w32\r
endif\r
+ARCHIVE = $(DISTDIR).zip\r
+\r
+# whatever...\r
+NO_NULL_REALLOC = 1\r
\r
# The following line defines your compiler.\r
ifdef METROWERKS\r
CC = gcc\r
endif\r
# RM = rm -f\r
-CP = cp -fv\r
+CP = cp -afv\r
+\r
+ZIP = zip -qzR9\r
\r
# must be equal to DEBUG or NDEBUG\r
DB = NDEBUG\r
\r
ifeq ($(CC),mwcc)\r
LD = mwld\r
-CFLAGS += -gccinc -msgstyle gcc -inline off -opt nointrinsics -inst mmx -proc 586\r
-#CFLAGS += -w on,nounused,nounusedexpr\r
-#CFLAGS += -ansi strict\r
-CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"\r
-LD = mwld\r
RC = mwwinrc\r
LDFLAGS = -nostdlib\r
+AR = $(LD)\r
+ARFLAGS = -type library -w nocmdline $(OBJS) -o\r
+LIBEXT = lib\r
LIBPATH += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support"\r
LDLIBS += -lkernel32.lib -luser32.lib\r
LDLIBS += -lMSL_Runtime_x86.lib -lMSL_C_x86.lib -lMSL_Extras_x86.lib\r
-LIBEXT = lib\r
RCFLAGS =\r
+CFLAGS += -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 586\r
+CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support"\r
+CFLAGS += -w on,nounused,nounusedexpr # -ansi strict\r
else\r
LD = gcc\r
RC = windres\r
LDFLAGS = -s\r
+AR = ar\r
+ARFLAGS = -cq\r
LIBEXT = a\r
RCFLAGS = -I rc -O coff -i\r
-CFLAGS += -Wall -Wno-format -Wno-unused # -pedantic\r
+CFLAGS += -fno-strict-aliasing -Wall -Wno-unused # -pedantic\r
endif\r
\r
ifndef COPYR\r
- COPYR = Copyright (c) 2005 The Open Source Community.\r
+ COPYR = Copyright (c) 2006 The Open Source Community.\r
endif\r
ifndef DESCR\r
- DESCR = $(TARGET) Command Extension\r
+ DESCR = $(notdir $(@:.rc=)) Command Extension\r
endif\r
DESCR += - $(CC) build\r
\r
-INCLUDES += -I. -I$(LIBGD) -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK)\r
-ifeq ($(SOURCE),rrd_cgi)\r
-INCLUDES += -I$(LIBCGI)\r
-endif\r
+INCLUDES += -I. -I$(LIBPNG) -I$(LIBFT2)/include -I$(LIBART) -I$(ZLIBSDK) \r
\r
CFLAGS += $(INCLUDES)\r
\r
-vpath %.c . $(LIBGD) $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) $(LIBCGI)\r
+vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) \r
\r
RRDLIBOBJS = \\r
$(OBJDIR)/rrd_afm.o \\r
$(OBJDIR)/rrd_update.o \\r
$(OBJDIR)/rrd_version.o \\r
$(OBJDIR)/rrd_xport.o \\r
- $(OBJDIR)/rrd_not_thread_safe.o \\r
+ $(OBJDIR)/rrd_thread_safe_nt.o \\r
$(EOLIST)\r
\r
XLIBOBJS = \\r
$(OBJDIR)/strftime.o \\r
$(EOLIST)\r
\r
-GD2LIBOBJS = \\r
- $(OBJDIR)/gd.o \\r
- $(OBJDIR)/gd_io.o \\r
- $(OBJDIR)/gd_io_dp.o \\r
- $(OBJDIR)/gd_io_file.o \\r
- $(OBJDIR)/gd_io_ss.o \\r
- $(OBJDIR)/gd_png.o \\r
- $(OBJDIR)/gd_ss.o \\r
- $(OBJDIR)/gdcache.o \\r
- $(OBJDIR)/gdfonts.o \\r
- $(OBJDIR)/gdhelpers.o \\r
- $(OBJDIR)/gdtables.o \\r
- $(EOLIST)\r
-\r
PNGLIBOBJS = \\r
$(OBJDIR)/png.o \\r
$(OBJDIR)/pngerror.o \\r
ARTLIBOBJS = \\r
$(patsubst $(LIBART)/libart_lgpl/%.c,$(OBJDIR)/%.o,$(wildcard $(LIBART)/libart_lgpl/art_*.c))\r
\r
-OBJS = $(RRDLIBOBJS) $(XLIBOBJS) $(GD2LIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)\r
-ifeq ($(SOURCE),rrd_cgi)\r
-OBJS += $(OBJDIR)/cgi.o\r
-endif\r
-OBJS += $(OBJDIR)/$(SOURCE).o\r
+OBJS := $(RRDLIBOBJS) $(XLIBOBJS) $(PNGLIBOBJS) $(ARTLIBOBJS) $(ZLIBOBJS)\r
+OBJCGI := $(OBJS) $(OBJDIR)/rrd_cgi.o\r
+OBJTOOL := $(OBJS) $(OBJDIR)/rrd_tool.o\r
\r
-LDLIBS = $(LIBFT2)/objs/freetype.$(LIBEXT)\r
+LDLIBS += $(LIBFT2)/objs/freetype.$(LIBEXT)\r
\r
\r
-all: $(OBJDIR) config.h $(OBJDIR)/$(TARGET).exe\r
+all: rrdtool rrdcgi\r
\r
-dist: all\r
- -$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv\r
- -$(RM) $(OBJDIR)/$(TARGET).def $(OBJDIR)/$(TARGET).res\r
+rrdtool: $(OBJDIR) config.h $(OBJDIR)/rrdtool.exe\r
+rrdcgi: $(OBJDIR) config.h $(OBJDIR)/rrdcgi.$(CGIEXT)\r
+librrd: $(OBJDIR) config.h $(OBJDIR)/librrd.$(LIBEXT)\r
\r
-install: all\r
- @[ -d $(INSTDIR) ] || mkdir $(INSTDIR)\r
- @$(CP) $(TARGET).exe $(INSTDIR)\r
+dist: all $(DISTDIR) $(DISTDIR)/readme.txt\r
+# @-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DISTDIR)\r
+ @-$(CP) $(OBJDIR)/rrdcgi.$(CGIEXT) $(DISTDIR)\r
+ @-$(CP) $(OBJDIR)/rrdtool.exe $(DISTDIR)\r
+ @-$(CP) $(RRD_DEFAULT_FONT) $(DISTDIR)\r
+ @-$(CP) ../CHANGES $(DISTDIR)\r
+ @-$(CP) ../COPYING $(DISTDIR)\r
+ @-$(CP) ../COPYRIGHT $(DISTDIR)\r
+ @-$(CP) ../NEWS $(DISTDIR)\r
+ @-$(CP) ../README $(DISTDIR)\r
+ @echo Creating $(ARCHIVE)\r
+ @$(ZIP) $(ARCHIVE) $(DISTDIR)/* < $(DISTDIR)/readme.txt\r
\r
clean:\r
-$(RM) -r $(OBJDIR)\r
-$(RM) config.h\r
\r
+distclean: clean\r
+ -$(RM) -r $(DISTDIR)\r
+ -$(RM) $(ARCHIVE)\r
+\r
$(OBJDIR):\r
- @mkdir $(OBJDIR)\r
+ @mkdir $@\r
+\r
+$(DISTDIR):\r
+ @mkdir $@\r
\r
-$(OBJDIR)/version.inc: ../configure $(OBJDIR) get_ver.awk\r
+$(OBJDIR)/version.inc: ../configure.ac $(OBJDIR) get_ver.awk\r
@echo Creating $@\r
@awk -f get_ver.awk $< > $@\r
\r
@echo Compiling $<\r
@$(CC) $(CFLAGS) -c $< -o $@\r
\r
-$(OBJDIR)/$(TARGET).exe: $(OBJS) $(OBJDIR)/$(TARGET).res\r
+$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.res\r
@echo Linking $@\r
@-$(RM) $@\r
@$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)\r
\r
+$(OBJDIR)/rrdtool.exe: $(OBJTOOL) $(OBJDIR)/rrdtool.res\r
+ @echo Linking $@\r
+ @-$(RM) $@\r
+ @$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)\r
+\r
+$(OBJDIR)/librrd.$(LIBEXT): $(OBJS)\r
+ @echo Creating $@\r
+ @-$(RM) $@\r
+ @$(AR) $(ARFLAGS) $@ $^\r
+\r
$(OBJDIR)/%.res: $(OBJDIR)/%.rc\r
@echo Creating $@\r
@$(RC) $(RCFLAGS) $< -o $@\r
@echo BLOCK "040904E4" >> $@\r
@echo BEGIN >> $@\r
@echo VALUE "LegalCopyright","$(COPYR)\0" >> $@\r
-# @echo VALUE "CompanyName","$(COMPANY)\0" >> $@\r
- @echo VALUE "ProductName","$(TARGET).exe\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
@echo VALUE "FileDescription","$(DESCR)\0" >> $@\r
@echo VALUE "FileVersion","$(RRD_VERSION_STR)\0" >> $@\r
- @echo VALUE "InternalName","$(TARGET)\0" >> $@\r
- @echo VALUE "OriginalFilename","$(TARGET).exe\0" >> $@\r
-ifdef WWWURL\r
+ @echo VALUE "InternalName","$(notdir $(@:.rc=))\0" >> $@\r
+ @echo VALUE "OriginalFilename","$(notdir $(@:.rc=.exe))\0" >> $@\r
@echo VALUE "WWW","$(WWWURL)\0" >> $@\r
-endif\r
@echo END >> $@\r
@echo END >> $@\r
@echo BLOCK "VarFileInfo" >> $@\r
@echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@\r
@echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@\r
@echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@\r
- @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@\r
+# @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@\r
@echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@\r
@echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@\r
@echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@\r
@echo $(DL)#define HAVE_TERMIOS_H 1$(DL) >> $@\r
@echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@\r
@echo $(DL)#define HAVE_UNAME 1$(DL) >> $@\r
-# @echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@\r
@echo $(DL)#define STDC_HEADERS 1$(DL) >> $@\r
@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@\r
@echo $(DL)#define HAVE_ZLIB_H 1$(DL) >> $@\r
@echo $(DL)#define HAVE_LIBZ 1$(DL) >> $@\r
+ifdef NO_NULL_REALLOC\r
+ @echo $(DL)#define NO_NULL_REALLOC 1$(DL) >> $@\r
+ @echo $(DL)#define rrd_realloc(a,b) ( (a) == NULL ? malloc( (b) ) : realloc( (a) , (b) ))$(DL) >> $@\r
+else\r
@echo $(DL)#define rrd_realloc(a,b) realloc((a), (b))$(DL) >> $@\r
- @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE 90.0$(DL) >> $@\r
+endif\r
+ @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@\r
+ @echo $(DL)#define RRD_DEFAULT_FONT $(RRD_DEFAULT_FONT)$(DL) >> $@\r
+ @echo $(DL)#define strftime strftime_$(DL) >> $@\r
+ifdef WITH_PIECHART\r
+ @echo $(DL)#define WITH_PIECHART 1$(DL) >> $@\r
+endif\r
+\r
+$(DISTDIR)/readme.txt: Makefile.Win32\r
+ @echo Creating $@\r
+ @echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@\r
+ @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)$(WWWURL)$(DL) >> $@\r
\r
\r
projects / rrdtool.git / blobdiff