X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2FMakefile.Win32;h=c9230d4f650d2dfa7946ff0d00cee41ffdd88f26;hb=9e6db622e8756105c1322481b34650ecbe15da1a;hp=7d1908a1365ab1cd38f7062f3eeacaabb7a530ca;hpb=c521d5fc2123833ce6bbf81cd2c05119d10b3ce4;p=rrdtool.git diff --git a/src/Makefile.Win32 b/src/Makefile.Win32 index 7d1908a..c9230d4 100644 --- a/src/Makefile.Win32 +++ b/src/Makefile.Win32 @@ -1,11 +1,6 @@ -# Gnu Makefile for Win32 target * 14-Jan-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] [BINEXT=cgi] - -# What to build -ifndef BINEXT -BINEXT = exe -endif +# use with: make -f Makefile.Win32 [all|clean|dist|distclean] DESCR = Round Robin Database Tool COPYR = Copyright (c) 1997-2006 by Tobias Oetiker @@ -14,13 +9,22 @@ WWWURL = http://www.rrdtool.org/ ICON = ../favicon.ico # Set the default font used in graphs. -RRD_DEFAULT_FONT = "arial.ttf" +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 -# Edit the path below to point to your install destination. -INSTDIR = c:/mrtg/rrd +# Set to one if you want to have piecharts. +WITH_PIECHART = 1 + +# Set the extension used for rrdcgi. +ifndef CGIEXT +CGIEXT = exe +endif # Base for the lib sources ifndef LIBBASE @@ -29,12 +33,12 @@ 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 +LIBPNG = $(LIBBASE)/libpng-1.2.10 endif # Edit the path below to point to your freetype sources or set environment var. ifndef LIBFT2 -#LIBFT2 = $(LIBBASE)/freetype-2.1.9 -LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.1.9 +#LIBFT2 = $(LIBBASE)/freetype-2.1.10 +LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.1.10 endif # Edit the path below to point to your freetype sources or set environment var. ifndef LIBART @@ -44,10 +48,12 @@ 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 + +# Edit the path below to point to your distribution folder. +ifndef DISTDIR +DISTDIR = rrdtool-$(RRD_VERSION_STR)-w32 endif +ARCHIVE = $(DISTDIR).zip # whatever... NO_NULL_REALLOC = 1 @@ -61,6 +67,8 @@ endif # RM = rm -f CP = cp -afv +ZIP = zip -qzR9 + # must be equal to DEBUG or NDEBUG DB = NDEBUG # DB = DEBUG @@ -83,6 +91,8 @@ 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 @@ -95,6 +105,8 @@ 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 @@ -104,18 +116,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$(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) CFLAGS += $(INCLUDES) -vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) $(LIBCGI) +vpath %.c . $(LIBPNG) $(LIBART)/libart_lgpl $(ZLIBSDK) RRDLIBOBJS = \ $(OBJDIR)/rrd_afm.o \ @@ -198,43 +207,48 @@ ZLIBOBJS += \ $(EOLIST) endif -CGIOBJS = \ - $(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) - -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) $(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.$(CGIEXT) +librrd: $(OBJDIR) config.h $(OBJDIR)/librrd.$(LIBEXT) -install: all - @[ -d $(INSTDIR) ] || mkdir $(INSTDIR) - @$(CP) $(TARGET).$(BINEXT) $(INSTDIR) +dist: all $(DISTDIR) $(DISTDIR)/readme.txt +# @-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DISTDIR) + @-$(CP) $(OBJDIR)/rrdcgi.$(CGIEXT) $(DISTDIR) + @-$(CP) $(OBJDIR)/rrdtool.exe $(DISTDIR) + @-$(CP) $(RRD_DEFAULT_FONT) $(DISTDIR) + @-$(CP) ../CHANGES $(DISTDIR) + @-$(CP) ../COPYING $(DISTDIR) + @-$(CP) ../COPYRIGHT $(DISTDIR) + @-$(CP) ../NEWS $(DISTDIR) + @-$(CP) ../README $(DISTDIR) + @echo Creating $(ARCHIVE) + @$(ZIP) $(ARCHIVE) $(DISTDIR)/* < $(DISTDIR)/readme.txt clean: -$(RM) -r $(OBJDIR) -$(RM) config.h +distclean: clean + -$(RM) -r $(DISTDIR) + -$(RM) $(ARCHIVE) + $(OBJDIR): - @mkdir $(OBJDIR) + @mkdir $@ + +$(DISTDIR): + @mkdir $@ $(OBJDIR)/version.inc: ../configure.ac $(OBJDIR) get_ver.awk @echo Creating $@ @@ -244,11 +258,21 @@ $(OBJDIR)/%.o: %.c @echo Compiling $< @$(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/$(TARGET).$(BINEXT): $(OBJS) $(OBJDIR)/$(TARGET).res +$(OBJDIR)/rrdcgi.$(CGIEXT): $(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 $@ @@ -268,17 +292,17 @@ $(OBJDIR)/%.rc: Makefile.Win32 $(OBJDIR)/version.inc @echo BLOCK "040904E4" >> $@ @echo BEGIN >> $@ @echo VALUE "LegalCopyright","$(COPYR)\0" >> $@ -# @echo VALUE "CompanyName","$(COMPANY)\0" >> $@ - @echo VALUE "ProductName","$(TARGET).$(BINEXT)\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" >> $@ @echo VALUE "FileDescription","$(DESCR)\0" >> $@ @echo VALUE "FileVersion","$(RRD_VERSION_STR)\0" >> $@ - @echo VALUE "InternalName","$(TARGET)\0" >> $@ - @echo VALUE "OriginalFilename","$(TARGET).$(BINEXT)\0" >> $@ -ifdef WWWURL + @echo VALUE "InternalName","$(notdir $(@:.rc=))\0" >> $@ + @echo VALUE "OriginalFilename","$(notdir $(@:.rc=.exe))\0" >> $@ @echo VALUE "WWW","$(WWWURL)\0" >> $@ -endif @echo END >> $@ @echo END >> $@ @echo BLOCK "VarFileInfo" >> $@ @@ -350,13 +374,16 @@ endif @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(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 +$(DISTDIR)/readme.txt: Makefile.Win32 @echo Creating $@ @echo $(DL)This is a binary distribution for Win32 platform.$(DL) > $@ - @echo $(DL)MRTG rrdtool version $(RRD_VERSION_STR)$(DL) >> $@ - @echo $(DL)Please download the complete RRD package for$(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) >> $@ + @echo $(DL)$(WWWURL)$(DL) >> $@