From c8d2ca608fe98a2f8982c4d8e26af38417fd1a04 Mon Sep 17 00:00:00 2001
From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Tue, 1 May 2007 16:24:03 +0000
Subject: [PATCH] updated win32 and netware Makefiles -- Guenter Knauf

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@1038 a5681a0c-68f1-0310-ab6d-d61299d08faa
---
 netware/Makefile | 16 ++++++++++++----
 win32/Makefile   | 11 +++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/netware/Makefile b/netware/Makefile
index ea411f5..c138dfa 100644
--- a/netware/Makefile
+++ b/netware/Makefile
@@ -1,6 +1,9 @@
-# Gnu Makefile for NetWare target * 15-Feb-2007
+# Gnu Makefile for NetWare target
 # for use with gcc/nlmconv or Metrowerks CodeWarrior compiler
 # use with: make -f Makefile [help|all|clean|dev|devclean|dist|distclean]
+#
+# $id: $
+#
 
 DESCR	= Round Robin Database Tool $(RRD_VERSION_STR)
 COPYR	= Copyright (c) 1997-2007 by Tobias Oetiker
@@ -43,7 +46,7 @@ LIBPNG	= $(LIBBASE)/libpng-1.2.16
 endif
 # Edit the path below to point to your freetype sources or set environment var.
 ifndef LIBFT2
-LIBFT2	= $(LIBBASE)/freetype-2.3.1
+LIBFT2	= $(LIBBASE)/freetype-2.3.4
 endif
 # Edit the path below to point to your libart sources or set environment var.
 ifndef LIBART
@@ -95,7 +98,7 @@ FIXNLMN	= fixnlmname #-q
 # Here you can find a native Win32 binary of the original awk:
 # http://www.gknw.net/development/prgtools/awk.zip
 AWK	= awk
-ZIP	= zip -qzR9
+ZIP	= zip -qzr9
 MV	= mv -fv
 
 # must be equal to DEBUG or NDEBUG
@@ -124,8 +127,9 @@ ifeq ($(CC),mwccnlm)
 LD	= mwldnlm
 LDFLAGS	= -nostdlib $^ $(PRELUDE) $(LDLIBS) -o $@ -commandfile
 AR	= $(LD)
-ARFLAGS	= -type library -w nocmdline $(OBJS) -o
+ARFLAGS	= -nostdlib -type library -o
 LIBEXT	= lib
+#RANLIB	=
 CFLAGS	+= -gccinc -inline off -opt nointrinsics -proc 586
 CFLAGS	+= -relax_pointers
 #CFLAGS	+= -w on,nounused,nounusedexpr # -ansi strict
@@ -143,6 +147,7 @@ LDFLAGS	= -T
 AR	= ar
 ARFLAGS	= -cq
 LIBEXT	= a
+RANLIB	= ranlib
 CFLAGS	+= -fno-builtin -fpcc-struct-return -fno-strict-aliasing
 CFLAGS	+= -Wall -Wno-unused # -pedantic
 ifeq ($(LIBARCH),LIBC)
@@ -369,6 +374,9 @@ $(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
 	@echo Creating $@
 	@-$(RM) $@
 	@$(AR) $(ARFLAGS) $@ $^
+ifdef RANLIB
+	@$(RANLIB) $@
+endif
 
 $(OBJDIR)/%.xdc: Makefile
 	@echo Creating $@
diff --git a/win32/Makefile b/win32/Makefile
index c3c092b..8c392d5 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1,6 +1,9 @@
-# Gnu Makefile for Win32 target * 15-Feb-2007
+# Gnu Makefile for Win32 target
 # for use with MingW32 gcc or Metrowerks CodeWarrior compiler
 # use with: make -f Makefile [help|all|clean|dev|devclean|dist|distclean]
+#
+# $id: $
+#
 
 DESCR	= Round Robin Database Tool
 COPYR	= Copyright (c) 1997-2007 by Tobias Oetiker
@@ -34,8 +37,8 @@ LIBPNG	= $(LIBBASE)/libpng-1.2.16
 endif
 # Edit the path below to point to your freetype sources or set environment var.
 ifndef LIBFT2
-#LIBFT2	= $(LIBBASE)/freetype-2.3.1
-LIBFT2	= $(LIBBASE)/../mingw32/freetype-2.3.1
+#LIBFT2	= $(LIBBASE)/freetype-2.3.4
+LIBFT2	= $(LIBBASE)/../mingw32/freetype-2.3.4
 endif
 # Edit the path below to point to your libart sources or set environment var.
 ifndef LIBART
@@ -72,7 +75,7 @@ CP	= cp -afv
 # Here you can find a native Win32 binary of the original awk:
 # http://www.gknw.net/development/prgtools/awk.zip
 AWK	= awk
-ZIP	= zip -qzR9
+ZIP	= zip -qzr9
 
 # must be equal to DEBUG or NDEBUG
 DB	= NDEBUG
-- 
2.11.0