Attached a patch for the rrd-tool LIBDBI integration with the following improvements:

[rrdtool.git] / netware / Makefile

diff --git a/netware/Makefile b/netware/Makefile
index df6a9b0..ec4e287 100644 (file)
--- a/netware/Makefile
+++ b/netware/Makefile
@@ -1,9 +1,12 @@
-# Gnu Makefile for NetWare target * 09-Sep-2006
+# 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-2006 by Tobias Oetiker
+COPYR  = Copyright (c) 1997-2007 by Tobias Oetiker
 WWWURL = http://www.rrdtool.org/
 MTSAFE = YES
 #SCREEN        = $(DESCR)
@@ -39,11 +42,11 @@ endif
 # All library code is statically linked to avoid problems with other lib NLMs.
 # Edit the path below to point to your libpng sources or set environment var.
 ifndef LIBPNG
-LIBPNG = $(LIBBASE)/libpng-1.2.12
+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.2.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,8 +147,9 @@ LDFLAGS     = -T
 AR     = ar
 ARFLAGS        = -cq
 LIBEXT = a
-CFLAGS += -fno-builtin -fpack-struct -fpcc-struct-return -fno-strict-aliasing
-CFLAGS += -Wall -Wno-unused -Wno-return-type # -pedantic
+RANLIB = ranlib
+CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
+CFLAGS += -Wall -Wno-unused # -pedantic
 ifeq ($(LIBARCH),LIBC)
        PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
 else
@@ -167,9 +172,6 @@ endif
 ifeq ($(MTSAFE),NO)
        XDCOPT = -u
 endif
-ifndef COPYR
-       COPYR = Copyright (c) 2006 The Open Source Community.
-endif
 ifndef DESCR
        DESCR = $(notdir $(@:.def=)) Command Extension
 endif
@@ -207,6 +209,7 @@ RRDLIBOBJS  = \
        $(OBJDIR)/rrd_hw.o \
        $(OBJDIR)/rrd_info.o \
        $(OBJDIR)/rrd_last.o \
+       $(OBJDIR)/rrd_lastupdate.o \
        $(OBJDIR)/rrd_nan_inf.o \
        $(OBJDIR)/rrd_open.o \
        $(OBJDIR)/rrd_resize.o \
@@ -220,11 +223,11 @@ RRDLIBOBJS        = \
        $(EOLIST)
 
 XLIBOBJS       = \
+       $(OBJDIR)/rrd_getopt.o \
+       $(OBJDIR)/rrd_getopt1.o \
        $(OBJDIR)/art_rgba_svp.o \
-       $(OBJDIR)/getopt.o \
-       $(OBJDIR)/getopt1.o \
        $(OBJDIR)/hash_32.o \
-       $(OBJDIR)/parsetime.o \
+       $(OBJDIR)/rrd_parsetime.o \
        $(OBJDIR)/pngsize.o \
        $(EOLIST)
 
@@ -287,8 +290,9 @@ rrdtool: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/rrdtool.nlm
 rrdcgi: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/rrdcgi.$(CGIEXT)
 librrd: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/librrd.$(LIBEXT)
 
+FORCE: ;
+
 dist: all $(DISTDIR) $(DISTDIR)/readme.txt
-#      @-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DISTDIR)
        @-$(CP) $(OBJDIR)/rrdcgi.$(CGIEXT) $(DISTDIR)
        @-$(CP) $(OBJDIR)/rrdtool.nlm $(DISTDIR)
        @-$(CP) $(PROOT)/src/*.ttf $(DISTDIR)
@@ -370,6 +374,9 @@ $(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
        @echo Creating $@
        @-$(RM) $@
        @$(AR) $(ARFLAGS) $@ $^
+ifdef RANLIB
+       @$(RANLIB) $@
+endif
 
 $(OBJDIR)/%.xdc: Makefile
        @echo Creating $@
@@ -433,7 +440,7 @@ ifeq ($(LD),nlmconv)
        @echo $(DL)output $(notdir $(@:.def=.nlm))$(DL) >> $@
 endif
 
-$(PROOT)/rrd_config.h: Makefile
+$(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc
        @echo Creating $@
        @echo $(DL)/* $(notdir $@) for NetWare target.$(DL) > $@
        @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
@@ -469,7 +476,6 @@ $(PROOT)/rrd_config.h: Makefile
        @echo $(DL)#define HAVE_SELECT 1$(DL) >> $@
        @echo $(DL)#define HAVE_SETLOCALE 1$(DL) >> $@
        @echo $(DL)#define HAVE_SETJMP_H 1$(DL) >> $@
-#      @echo $(DL)#define HAVE_SIGNAL 1$(DL) >> $@
        @echo $(DL)#define HAVE_SNPRINTF 1$(DL) >> $@
        @echo $(DL)#define HAVE_STDARG_H 1$(DL) >> $@
        @echo $(DL)#define HAVE_STDDEF_H 1$(DL) >> $@
@@ -490,7 +496,6 @@ $(PROOT)/rrd_config.h: Makefile
        @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) >> $@
@@ -507,7 +512,7 @@ ifdef RRD_DEFAULT_FONT
 endif
        @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@
 ifdef WITH_PIECHART
-       @echo $(DL)#define WITH_PIECHART 1$(DL) >> $@
+       @echo $(DL)#define WITH_PIECHART $(WITH_PIECHART)$(DL) >> $@
 endif
        @echo $(DL)#endif /* RRD_CONFIG_H */$(DL) >> $@