From 4f7e223142e96d5549de252214c3ab3f825b8dbb Mon Sep 17 00:00:00 2001 From: oetiker Date: Fri, 9 Feb 2007 22:19:48 +0000 Subject: [PATCH] =?utf8?q?more=20build=20patches=20from=20G=C3=BCnter=20Kn?= =?utf8?q?auf?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@998 a5681a0c-68f1-0310-ab6d-d61299d08faa --- netware/Makefile | 14 ++++++-------- src/rrd_tool.h | 6 ++---- win32/Makefile | 16 ++++++++-------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/netware/Makefile b/netware/Makefile index bfcbc14..135f157 100644 --- a/netware/Makefile +++ b/netware/Makefile @@ -1,4 +1,4 @@ -# Gnu Makefile for NetWare target * 29-Jan-2007 +# Gnu Makefile for NetWare target * 08-Feb-2007 # for use with gcc/nlmconv or Metrowerks CodeWarrior compiler # use with: make -f Makefile [help|all|clean|dev|devclean|dist|distclean] @@ -143,8 +143,8 @@ 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 +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 +167,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 @@ -288,8 +285,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) @@ -434,7 +432,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) >> $@ diff --git a/src/rrd_tool.h b/src/rrd_tool.h index 1d8a214..cf4f45c 100644 --- a/src/rrd_tool.h +++ b/src/rrd_tool.h @@ -11,12 +11,10 @@ extern "C" { #ifndef _RRD_TOOL_H #define _RRD_TOOL_H -#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H) -#include "../win32/config.h" -#else #ifdef HAVE_CONFIG_H #include "../rrd_config.h" -#endif +#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) +#include "../win32/config.h" #endif #ifdef MUST_DISABLE_SIGFPE diff --git a/win32/Makefile b/win32/Makefile index b6e90c4..132bfc8 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1,4 +1,4 @@ -# Gnu Makefile for Win32 target * 29-Jan-2007 +# Gnu Makefile for Win32 target * 08-Feb-2007 # for use with MingW32 gcc or Metrowerks CodeWarrior compiler # use with: make -f Makefile [help|all|clean|dev|devclean|dist|distclean] @@ -34,7 +34,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.2.1 +#LIBFT2 = $(LIBBASE)/freetype-2.3.1 LIBFT2 = $(LIBBASE)/../mingw32/freetype-2.3.1 endif # Edit the path below to point to your libart sources or set environment var. @@ -106,6 +106,7 @@ LIBPATH += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support" LDLIBS += -lkernel32.lib -luser32.lib LDLIBS += -lMSL_Runtime_x86.lib -lMSL_C_x86.lib -lMSL_Extras_x86.lib RCFLAGS = +CFLAGS += -DWIN32 CFLAGS += -nostdinc -gccinc -msgstyle gcc -inline off -opt nointrinsics -proc 586 CFLAGS += -ir "$(METROWERKS)/MSL" -ir "$(METROWERKS)/Win32-x86 Support" CFLAGS += -w on,nounused,nounusedexpr # -ansi strict @@ -117,7 +118,8 @@ AR = ar ARFLAGS = -cq LIBEXT = a RCFLAGS = -O coff -i -CFLAGS += -fno-strict-aliasing -Wall -Wno-unused # -pedantic +CFLAGS += -fno-strict-aliasing +CFLAGS += -Wall -Wno-unused # -pedantic endif ifeq ($(findstring msys,$(OSTYPE)),msys) @@ -127,9 +129,6 @@ else DS = \\ endif -ifndef COPYR - COPYR = Copyright (c) 2007 The Open Source Community. -endif ifndef DESCR DESCR = $(notdir $(@:.rc=)) Command Extension endif @@ -239,8 +238,9 @@ rrdtool: $(OBJDIR) $(PROOT)/rrd_config.h $(OBJDIR)/rrdtool.exe 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.exe $(DISTDIR) @-$(CP) $(PROOT)/src/*.ttf $(DISTDIR) @@ -353,7 +353,7 @@ ifdef ICON @echo $(DL)10 ICON DISCARDABLE "$(ICON)"$(DL) >> $@ endif -$(PROOT)/rrd_config.h: Makefile $(OBJDIR)/version.inc +$(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc @echo Creating $@ @echo $(DL)/* $(notdir $@) for Win32 target.$(DL) > $@ @echo $(DL)** Do not edit this file - it is created by make!$(DL) >> $@ -- 2.30.2