diff --git a/netware/Makefile b/netware/Makefile
index df6a9b0694154b4e684028583d18ee2e6c85dce2..104e532789243e2097362e96b4f26aa038a6d321 100644 (file)
--- a/netware/Makefile
+++ b/netware/Makefile
-# 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-2008 by Tobias Oetiker
WWWURL = http://www.rrdtool.org/
MTSAFE = YES
#SCREEN = $(DESCR)
# 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.29
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.7
endif
# Edit the path below to point to your libart sources or set environment var.
ifndef LIBART
ifndef DISTDIR
DISTDIR = rrdtool-$(RRD_VERSION_STR)-nw
endif
-DISTARC = $(DISTDIR).zip
+ifndef DISTARC
+DISTARC = $(DISTDIR).$(ARCEXT)
+endif
# Edit the path below to point to your distribution folder.
ifndef DEVLDIR
DEVLDIR = rrdtool-$(RRD_VERSION_STR)-sdk-nw
endif
-DEVLARC = $(DEVLDIR).zip
+ifndef DEVLARC
+DEVLARC = $(DEVLDIR).$(ARCEXT)
+endif
# whatever...
# NO_NULL_REALLOC = 1
# 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
MV = mv -fv
+ifeq ($(ARCEXT),7z)
+ARCBIN = 7za a
+else
+ARCBIN = zip -qzr9
+ARCEXT = zip
+endif
+
# must be equal to DEBUG or NDEBUG
DB = NDEBUG
# DB = DEBUG
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
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
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
$(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 \
$(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)/pngsize.o \
OBJCGI := $(OBJS) $(OBJDIR)/rrd_cgi.o
OBJTOOL := $(OBJS) $(OBJDIR)/rrd_tool.o
-LDLIBS += $(LIBFT2)/builds/netware/libc/libft2.$(LIBEXT)
+LDLIBS += $(LIBFT2)/builds/netware/LIBC/libft2.$(LIBEXT)
all: rrdtool rrdcgi
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)
@-$(CP) $(PROOT)/NEWS $(DISTDIR)
@-$(CP) $(PROOT)/README $(DISTDIR)
@echo Creating $(DISTARC)
- @$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
+ @$(ARCBIN) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt
@-mkdir $(DEVLDIR)$(DS)include
@-$(CP) $(PROOT)/NEWS $(DEVLDIR)
@-$(CP) $(PROOT)/README $(DEVLDIR)
@echo Creating $(DEVLARC)
- @$(ZIP) $(DEVLARC) $(DEVLDIR)/* < $(DEVLDIR)/readme.txt
+ @$(ARCBIN) $(DEVLARC) $(DEVLDIR)/* < $(DEVLDIR)/readme.txt
clean:
-$(RM) -r $(OBJDIR)
@echo Creating $@
@-$(RM) $@
@$(AR) $(ARFLAGS) $@ $^
+ifdef RANLIB
+ @$(RANLIB) $@
+endif
$(OBJDIR)/%.xdc: Makefile
@echo Creating $@
@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) >> $@
@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) >> $@
@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) >> $@
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) >> $@