X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=netware%2FMakefile;h=ec4e287b3824fb9020d612b699c4313d54887785;hp=fdc7ebbd515b4879580bc17ae42a152bf8c9416f;hb=HEAD;hpb=30413631f04ed51f264b58d1238e74c137562223

diff --git a/netware/Makefile b/netware/Makefile
index fdc7ebb..ec4e287 100644
--- a/netware/Makefile
+++ b/netware/Makefile
@@ -1,6 +1,9 @@
-# Gnu Makefile for NetWare target * 22-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,12 +127,12 @@ 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 # -r
+CFLAGS	+= -relax_pointers
 #CFLAGS	+= -w on,nounused,nounusedexpr # -ansi strict
-CFLAGS	+= -w noerror,noiserror
 ifeq ($(LIBARCH),LIBC)
 	PRELUDE = $(SDK_LIBC)/imports/libcpre.o
 	CFLAGS += -align 4
@@ -144,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)
@@ -223,7 +227,7 @@ XLIBOBJS	= \
 	$(OBJDIR)/rrd_getopt1.o \
 	$(OBJDIR)/art_rgba_svp.o \
 	$(OBJDIR)/hash_32.o \
-	$(OBJDIR)/parsetime.o \
+	$(OBJDIR)/rrd_parsetime.o \
 	$(OBJDIR)/pngsize.o \
 	$(EOLIST)
 
@@ -370,6 +374,9 @@ $(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
 	@echo Creating $@
 	@-$(RM) $@
 	@$(AR) $(ARFLAGS) $@ $^
+ifdef RANLIB
+	@$(RANLIB) $@
+endif
 
 $(OBJDIR)/%.xdc: Makefile
 	@echo Creating $@
@@ -489,7 +496,6 @@ $(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc
 	@echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_TZSET 1$(DL) >> $@
 	@echo $(DL)#define HAVE_UNAME 1$(DL) >> $@
-	@echo $(DL)#define HAVE_UNISTD_H 1$(DL) >> $@
 	@echo $(DL)#define HAVE_VSNPRINTF 1$(DL) >> $@
 	@echo $(DL)#define STDC_HEADERS 1$(DL) >> $@
 	@echo $(DL)#define TIME_WITH_SYS_TIME 1$(DL) >> $@