diff --git a/netware/Makefile b/netware/Makefile
index e8d6a4730f6305865e6818bac49de5a436b30927..ec4e287b3824fb9020d612b699c4313d54887785 100644 (file)
--- a/netware/Makefile
+++ b/netware/Makefile
# 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.23
+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.5
+LIBFT2 = $(LIBBASE)/freetype-2.3.4
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
-ifndef DISTARC
-DISTARC = $(DISTDIR).$(ARCEXT)
-endif
+DISTARC = $(DISTDIR).zip
# Edit the path below to point to your distribution folder.
ifndef DEVLDIR
DEVLDIR = rrdtool-$(RRD_VERSION_STR)-sdk-nw
endif
-ifndef DEVLARC
-DEVLARC = $(DEVLDIR).$(ARCEXT)
-endif
+DEVLARC = $(DEVLDIR).zip
# 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
-ifndef ARCBIN
-ARCBIN = zip -qzr9
-ARCEXT = zip
-#ARCBIN = 7za a
-#ARCEXT = 7z
-endif
-
# must be equal to DEBUG or NDEBUG
DB = NDEBUG
$(OBJDIR)/rrd_getopt1.o \
$(OBJDIR)/art_rgba_svp.o \
$(OBJDIR)/hash_32.o \
- $(OBJDIR)/parsetime.o \
+ $(OBJDIR)/rrd_parsetime.o \
$(OBJDIR)/pngsize.o \
$(EOLIST)
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
@-$(CP) $(PROOT)/NEWS $(DISTDIR)
@-$(CP) $(PROOT)/README $(DISTDIR)
@echo Creating $(DISTARC)
- @$(ARCBIN) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
+ @$(ZIP) $(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)
- @$(ARCBIN) $(DEVLARC) $(DEVLDIR)/* < $(DEVLDIR)/readme.txt
+ @$(ZIP) $(DEVLARC) $(DEVLDIR)/* < $(DEVLDIR)/readme.txt
clean:
-$(RM) -r $(OBJDIR)