From 16965cafcbec5c46141b7790187cc51a285beef0 Mon Sep 17 00:00:00 2001
From: oetiker <oetiker@a5681a0c-68f1-0310-ab6d-d61299d08faa>
Date: Mon, 18 Sep 2006 05:45:16 +0000
Subject: [PATCH] fix faild netware makefile merge -- Guenter Knauf

git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@898 a5681a0c-68f1-0310-ab6d-d61299d08faa
---
 netware/Makefile | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/netware/Makefile b/netware/Makefile
index c2aecaf..df6a9b0 100644
--- a/netware/Makefile
+++ b/netware/Makefile
@@ -96,6 +96,7 @@ FIXNLMN	= fixnlmname #-q
 # http://www.gknw.net/development/prgtools/awk.zip
 AWK	= awk
 ZIP	= zip -qzR9
+MV	= mv -fv
 
 # must be equal to DEBUG or NDEBUG
 DB	= NDEBUG
@@ -143,7 +144,7 @@ AR	= ar
 ARFLAGS	= -cq
 LIBEXT	= a
 CFLAGS	+= -fno-builtin -fpack-struct -fpcc-struct-return -fno-strict-aliasing
-CFLAGS	+= -Wall -Wno-unused # -pedantic
+CFLAGS	+= -Wall -Wno-unused -Wno-return-type # -pedantic
 ifeq ($(LIBARCH),LIBC)
 	PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
 else
@@ -282,9 +283,9 @@ LDLIBS	+= $(LIBFT2)/builds/netware/libc/libft2.$(LIBEXT)
 
 all: rrdtool rrdcgi
 
-rrdtool: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/rrdtool.nlm
-rrdcgi: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/rrdcgi.$(CGIEXT)
-librrd: $(OBJDIR) $(PROOT)/config.h $(OBJDIR)/librrd.$(LIBEXT)
+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)
 
 dist: all $(DISTDIR) $(DISTDIR)/readme.txt
 #	@-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DISTDIR)
@@ -304,7 +305,7 @@ dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt
 	@-mkdir $(DEVLDIR)$(DS)lib
 	@-mkdir $(DEVLDIR)$(DS)src
 	@-$(CP) $(OBJDIR)/librrd.$(LIBEXT) $(DEVLDIR)/lib
-	@-$(CP) $(PROOT)/config.h $(DEVLDIR)/include
+	@-$(CP) $(PROOT)/rrd_config.h $(DEVLDIR)/include
 	@-$(CP) $(PROOT)/src/rrd.h $(DEVLDIR)/include
 	@-$(CP) $(PROOT)/src/*.ttf $(DEVLDIR)/src
 	@-$(CP) $(PROOT)/CHANGES $(DEVLDIR)
@@ -317,7 +318,7 @@ dev: librrd $(DEVLDIR) $(DEVLDIR)/readme.txt
 
 clean:
 	-$(RM) -r $(OBJDIR)
-	-$(RM) $(PROOT)/config.h
+	-$(RM) $(PROOT)/rrd_config.h
 
 distclean: clean
 	-$(RM) -r $(DISTDIR)
@@ -348,6 +349,9 @@ $(OBJDIR)/rrdcgi.$(CGIEXT): $(OBJCGI) $(OBJDIR)/rrdcgi.def $(OBJDIR)/rrdcgi.xdc
 	@echo Linking $@
 	@-$(RM) $@
 	@$(LD) $(LDFLAGS) $(@:.$(CGIEXT)=.def)
+ifeq ($(LD),nlmconv)
+	@$(MV) $(notdir $@) $@
+endif
 ifneq ($(CGIEXT),nlm)
 ifeq ($(LD),mwldnlm)
 	@$(FIXNLMN) $@
@@ -358,6 +362,9 @@ $(OBJDIR)/rrdtool.nlm: $(OBJTOOL) $(OBJDIR)/rrdtool.def $(OBJDIR)/rrdtool.xdc
 	@echo Linking $@
 	@-$(RM) $@
 	@$(LD) $(LDFLAGS) $(@:.nlm=.def)
+ifeq ($(LD),nlmconv)
+	@$(MV) $(notdir $@) $@
+endif
 
 $(OBJDIR)/librrd.$(LIBEXT): $(OBJS)
 	@echo Creating $@
@@ -428,15 +435,15 @@ endif
 
 $(PROOT)/rrd_config.h: Makefile
 	@echo Creating $@
-        @echo $(DL)/* $(notdir $@) for NetWare target.$(DL) > $@
+	@echo $(DL)/* $(notdir $@) for NetWare target.$(DL) > $@
 	@echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@
 	@echo $(DL)** All your changes will be lost!!$(DL) >> $@
 	@echo $(DL)*/$(DL) >> $@
 	@echo $(DL)#ifndef NETWARE$(DL) >> $@
-        @echo $(DL)#error This $(notdir $@) is created for NetWare platform!$(DL) >> $@
+	@echo $(DL)#error This $(notdir $@) is created for NetWare platform!$(DL) >> $@
 	@echo $(DL)#endif$(DL) >> $@
-        @echo $(DL)#ifndef RRD_CONFIG_H$(DL) >> $@
-        @echo $(DL)#define RRD_CONFIG_H$(DL) >> $@
+	@echo $(DL)#ifndef RRD_CONFIG_H$(DL) >> $@
+	@echo $(DL)#define RRD_CONFIG_H$(DL) >> $@
 	@echo $(DL)#define OS "i586-pc-NetWare"$(DL) >> $@
 	@echo $(DL)#define PACKAGE_VERSION "$(RRD_VERSION_STR)"$(DL) >> $@
 	@echo $(DL)#define PACKAGE_BUGREPORT "tobi@oetiker.ch"$(DL) >> $@
-- 
2.11.0