tiny updates to netware and win32 makefiles -- Guenter Knauf

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2@834 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/program/src/Makefile.NetWare b/program/src/Makefile.NetWare
index 6525179862f26fe438c2a546f06280a326395193..2b1b9a4e06e0bc6a6fa45665c26e76ba28dc9c1d 100644 (file)
--- a/program/src/Makefile.NetWare
+++ b/program/src/Makefile.NetWare
@@ -1,6 +1,6 @@
-# Gnu Makefile for NetWare target * 29-Jan-2006\r
+# Gnu Makefile for NetWare target * 19-May-2006\r
 # for use with gcc/nlmconv or Metrowerks CodeWarrior compiler\r
-# use with: make -f Makefile.NetWare [all|clean|dist]\r
+# use with: make -f Makefile.NetWare [all|clean|dist|distclean]\r
 \r
 DESCR  = Round Robin Database Tool $(RRD_VERSION_STR)\r
 COPYR  = Copyright (c) 1997-2006 by Tobias Oetiker\r
@@ -25,13 +25,15 @@ RRDGRAPH_YLEGEND_ANGLE = 90.0
 # 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 = nlm\r
+endif\r
+\r
 # Edit the path below to point to your Novell NDK.\r
 ifndef NDKBASE\r
 NDKBASE        = c:/novell\r
 endif\r
-# Edit the path below to point to your install destination.\r
-# INSTDIR = /mnt/sys/mrtg/rrd\r
-INSTDIR        = s:/rrdtool\r
 \r
 # Base for the lib sources\r
 ifndef LIBBASE\r
@@ -40,11 +42,11 @@ endif
 # All library code is statically linked to avoid problems with other lib NLMs. \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)/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
@@ -59,6 +61,12 @@ ifndef LIBCGI
 LIBCGI = $(LIBBASE)/cgilib-0.5\r
 endif\r
 \r
+# Edit the path below to point to your distribution folder.\r
+ifndef DISTDIR\r
+DISTDIR        = rrdtool-$(RRD_VERSION_STR)-nw\r
+endif\r
+ARCHIVE = $(DISTDIR).zip\r
+\r
 # whatever...\r
 # NO_NULL_REALLOC = 1\r
 \r
@@ -80,9 +88,13 @@ CP   = cp -afv
 # generating the xdc data for the linker; here's a minimal tool:\r
 # http://www.gknw.com/development/prgtools/mkxdc.zip\r
 MPKXDC = mkxdc\r
+# CodeWarrior is too stupid to set the internal name properly when\r
+# the extension is not a NLM and not a registered type. So we need\r
+# to fix that after linking (since CGI isnt a known type - argh!):\r
+# http://www.gknw.de/development/prgtools/fixnlmname.zip\r
+FIXNLMN        = fixnlmname #-q\r
 \r
 ZIP    = zip -qzR9\r
-ARCHIVE        = rrdtool-$(RRD_VERSION_STR)-nw.zip\r
 \r
 # must be equal to DEBUG or NDEBUG\r
 DB     = NDEBUG\r
@@ -269,35 +281,35 @@ LDLIBS    += $(LIBFT2)/builds/netware/libc/libft2.$(LIBEXT)
 all: rrdtool rrdcgi\r
 \r
 rrdtool: $(OBJDIR) config.h $(OBJDIR)/rrdtool.nlm\r
-rrdcgi: $(OBJDIR) config.h $(OBJDIR)/rrdcgi.nlm\r
+rrdcgi: $(OBJDIR) config.h $(OBJDIR)/rrdcgi.$(CGIEXT)\r
 librrd: $(OBJDIR) config.h $(OBJDIR)/librrd.$(LIBEXT)\r
 \r
-dist: all $(OBJDIR)/readme.txt\r
-       -$(RM) $(OBJDIR)/*.o $(OBJDIR)/*.map $(OBJDIR)/*.ncv\r
-       -$(RM) $(OBJDIR)/*.def $(OBJDIR)/*.xdc \r
-       -$(RM) $(OBJDIR)/version.inc\r
-       @-$(CP) $(RRD_DEFAULT_FONT) $(OBJDIR)\r
-       @-$(CP) ../CHANGES $(OBJDIR)\r
-       @-$(CP) ../COPYING $(OBJDIR)\r
-       @-$(CP) ../COPYRIGHT $(OBJDIR)\r
-       @-$(CP) ../NEWS $(OBJDIR)\r
-       @-$(CP) ../README $(OBJDIR)\r
+dist: all $(DISTDIR) $(DISTDIR)/readme.txt\r
+#      @-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DISTDIR)\r
+       @-$(CP) $(OBJDIR)/rrdcgi.$(CGIEXT) $(DISTDIR)\r
+       @-$(CP) $(OBJDIR)/rrdtool.nlm $(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) $(OBJDIR)/* < $(OBJDIR)/readme.txt\r
-\r
-install: all\r
-       @[ -d $(INSTDIR) ] || mkdir $(INSTDIR)\r
-       @$(CP) $(OBJDIR)/*.nlm $(INSTDIR)\r
+       @$(ZIP) $(ARCHIVE) $(DISTDIR)/* < $(DISTDIR)/readme.txt\r
 \r
 clean:\r
        -$(RM) -r $(OBJDIR)\r
        -$(RM) config.h\r
 \r
-cleandist: clean\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)/%.o: %.c\r
        @echo Compiling $<\r
@@ -307,10 +319,15 @@ $(OBJDIR)/version.inc: ../configure.ac $(OBJDIR) get_ver.awk
        @echo Creating $@\r
        @awk -f get_ver.awk $< > $@\r
 \r
-$(OBJDIR)/rrdcgi.nlm: $(OBJCGI) $(OBJDIR)/rrdcgi.def $(OBJDIR)/rrdcgi.xdc\r
+$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.def $(OBJDIR)/rrdcgi.xdc\r
        @echo Linking $@\r
        @-$(RM) $@\r
-       @$(LD) $(LDFLAGS) $(@:.nlm=.def)\r
+       @$(LD) $(LDFLAGS) $(@:.$(CGIEXT)=.def)\r
+ifneq ($(CGIEXT),nlm)\r
+ifeq ($(LD),mwldnlm)\r
+       @$(FIXNLMN) $@\r
+endif\r
+endif\r
 \r
 $(OBJDIR)/rrdtool.nlm: $(OBJTOOL) $(OBJDIR)/rrdtool.def $(OBJDIR)/rrdtool.xdc\r
        @echo Linking $@\r
@@ -455,7 +472,7 @@ ifdef WITH_PIECHART
        @echo $(DL)#define WITH_PIECHART 1$(DL) >> $@\r
 endif\r
 \r
-$(OBJDIR)/readme.txt: Makefile.NetWare\r
+$(DISTDIR)/readme.txt: Makefile.NetWare\r
        @echo Creating $@\r
        @echo $(DL)This is a binary distribution for NetWare platform.$(DL) > $@\r
        @echo $(DL)RRDTool version $(RRD_VERSION_STR)$(DL) >> $@\r

diff --git a/program/src/Makefile.Win32 b/program/src/Makefile.Win32
index 39e5ededfaf21d3cb743e5edadcf2be93d0f3cf7..c37aa00be033493299bec11d4da0cfa9cf2584e6 100644 (file)
--- a/program/src/Makefile.Win32
+++ b/program/src/Makefile.Win32
@@ -1,6 +1,6 @@
-# Gnu Makefile for Win32 target * 29-Jan-2006\r
+# Gnu Makefile for Win32 target * 19-May-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
 DESCR  = Round Robin Database Tool\r
 COPYR  = Copyright (c) 1997-2006 by Tobias Oetiker\r
@@ -10,9 +10,9 @@ ICON  = ../favicon.ico
 \r
 # Set the default font used in graphs.\r
 ifndef RRD_DEFAULT_FONT\r
-RRD_DEFAULT_FONT = "arial.ttf"\r
+#RRD_DEFAULT_FONT = "arial.ttf"\r
 #RRD_DEFAULT_FONT = "DejaVuSansMono-Roman.ttf"\r
-#RRD_DEFAULT_FONT = "VeraMono.ttf"\r
+RRD_DEFAULT_FONT = "VeraMono.ttf"\r
 endif\r
 \r
 # Vertical label angle: 90.0 (default) or 270.0\r
@@ -21,8 +21,10 @@ RRDGRAPH_YLEGEND_ANGLE = 90.0
 # Set to one if you want to have piecharts.\r
 WITH_PIECHART = 1\r
 \r
-# Edit the path below to point to your install destination.\r
-INSTDIR        = c:/rrdtool\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
@@ -31,12 +33,12 @@ endif
 # 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
@@ -51,6 +53,12 @@ ifndef LIBCGI
 LIBCGI = $(LIBBASE)/cgilib-0.5\r
 endif\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
@@ -64,7 +72,6 @@ endif
 CP     = cp -afv\r
 \r
 ZIP    = zip -qzR9\r
-ARCHIVE        = rrdtool-$(RRD_VERSION_STR)-w32.zip\r
 \r
 # must be equal to DEBUG or NDEBUG\r
 DB     = NDEBUG\r
@@ -222,34 +229,35 @@ LDLIBS    += $(LIBFT2)/objs/freetype.$(LIBEXT)
 all: rrdtool rrdcgi\r
 \r
 rrdtool: $(OBJDIR) config.h $(OBJDIR)/rrdtool.exe\r
-rrdcgi: $(OBJDIR) config.h $(OBJDIR)/rrdcgi.exe\r
+rrdcgi: $(OBJDIR) config.h $(OBJDIR)/rrdcgi.$(CGIEXT)\r
 librrd: $(OBJDIR) config.h $(OBJDIR)/librrd.$(LIBEXT)\r
 \r
-dist: all $(OBJDIR)/readme.txt\r
-       -$(RM) $(OBJDIR)/*.o $(OBJDIR)/*.map $(OBJDIR)/*.ncv\r
-       -$(RM) $(OBJDIR)/*.def $(OBJDIR)/*.res $(OBJDIR)/*.rc\r
-       -$(RM) $(OBJDIR)/version.inc\r
-       @-$(CP) ../CHANGES $(OBJDIR)\r
-       @-$(CP) ../COPYING $(OBJDIR)\r
-       @-$(CP) ../COPYRIGHT $(OBJDIR)\r
-       @-$(CP) ../NEWS $(OBJDIR)\r
-       @-$(CP) ../README $(OBJDIR)\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) $(OBJDIR)/* < $(OBJDIR)/readme.txt\r
-\r
-install: all\r
-       @[ -d $(INSTDIR) ] || mkdir $(INSTDIR)\r
-       @$(CP) $(OBJDIR)/*.exe $(INSTDIR)\r
+       @$(ZIP) $(ARCHIVE) $(DISTDIR)/* < $(DISTDIR)/readme.txt\r
 \r
 clean:\r
        -$(RM) -r $(OBJDIR)\r
        -$(RM) config.h\r
 \r
-cleandist: clean\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.ac $(OBJDIR) get_ver.awk\r
        @echo Creating $@\r
@@ -259,7 +267,7 @@ $(OBJDIR)/%.o: %.c
        @echo Compiling $<\r
        @$(CC) $(CFLAGS) -c $< -o $@\r
 \r
-$(OBJDIR)/rrdcgi.exe: $(OBJCGI) $(OBJDIR)/rrdcgi.res\r
+$(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.res\r
        @echo Linking $@\r
        @-$(RM) $@\r
        @$(LD) $(LDFLAGS) $^ -o $@ $(LIBPATH) $(LDLIBS)\r
@@ -379,7 +387,7 @@ ifdef WITH_PIECHART
        @echo $(DL)#define WITH_PIECHART 1$(DL) >> $@\r
 endif\r
 \r
-$(OBJDIR)/readme.txt: Makefile.Win32\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