From eb7c95171c437a16d055021b8f4fdb98f017f24f Mon Sep 17 00:00:00 2001 From: oetiker Date: Sun, 11 Mar 2007 13:08:31 +0000 Subject: [PATCH] fix netware and win32 makefiles for new getopt names git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@1019 a5681a0c-68f1-0310-ab6d-d61299d08faa --- netware/Makefile | 6 ++---- win32/Makefile | 16 +++++----------- win32/rrd.dsp | 10 +++++----- win32/rrdtool.dsp | 4 ++-- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/netware/Makefile b/netware/Makefile index fdc7ebb..ea411f5 100644 --- a/netware/Makefile +++ b/netware/Makefile @@ -1,4 +1,4 @@ -# Gnu Makefile for NetWare target * 22-Feb-2007 +# Gnu Makefile for NetWare target * 15-Feb-2007 # for use with gcc/nlmconv or Metrowerks CodeWarrior compiler # use with: make -f Makefile [help|all|clean|dev|devclean|dist|distclean] @@ -127,9 +127,8 @@ AR = $(LD) ARFLAGS = -type library -w nocmdline $(OBJS) -o LIBEXT = lib CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586 -CFLAGS += -relax_pointers # -r +CFLAGS += -relax_pointers #CFLAGS += -w on,nounused,nounusedexpr # -ansi strict -CFLAGS += -w noerror,noiserror ifeq ($(LIBARCH),LIBC) PRELUDE = $(SDK_LIBC)/imports/libcpre.o CFLAGS += -align 4 @@ -489,7 +488,6 @@ $(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc @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) >> $@ diff --git a/win32/Makefile b/win32/Makefile index 132bfc8..c3c092b 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1,4 +1,4 @@ -# Gnu Makefile for Win32 target * 08-Feb-2007 +# Gnu Makefile for Win32 target * 15-Feb-2007 # for use with MingW32 gcc or Metrowerks CodeWarrior compiler # use with: make -f Makefile [help|all|clean|dev|devclean|dist|distclean] @@ -170,9 +170,9 @@ 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)/pngsize.o \ @@ -371,11 +371,9 @@ $(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc @echo $(DL)#define HAVE_ASSERT_H 1$(DL) >> $@ @echo $(DL)#define HAVE_DLFCN_H 1$(DL) >> $@ @echo $(DL)#define HAVE_DLOPEN 1$(DL) >> $@ - @echo $(DL)#define HAVE_ERR_H 1$(DL) >> $@ @echo $(DL)#define HAVE_ERRNO_H 1$(DL) >> $@ @echo $(DL)#define HAVE_FCNTL_H 1$(DL) >> $@ @echo $(DL)#define HAVE_FIONBIO 1$(DL) >> $@ -# @echo $(DL)#define HAVE_GETTIMEOFDAY 1$(DL) >> $@ @echo $(DL)#define HAVE_INTTYPES_H 1$(DL) >> $@ @echo $(DL)#define HAVE_LIMITS_H 1$(DL) >> $@ @echo $(DL)#define HAVE_LONGLONG 1$(DL) >> $@ @@ -383,9 +381,7 @@ $(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc @echo $(DL)#define HAVE_MALLOC_H 1$(DL) >> $@ @echo $(DL)#define HAVE_MATH_H 1$(DL) >> $@ @echo $(DL)#define HAVE_MBSTOWCS 1$(DL) >> $@ - @echo $(DL)#define HAVE_SELECT 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) >> $@ @@ -398,12 +394,10 @@ $(PROOT)/rrd_config.h: FORCE Makefile $(OBJDIR)/version.inc @echo $(DL)#define HAVE_STRLCAT 1$(DL) >> $@ @echo $(DL)#define HAVE_STRLCPY 1$(DL) >> $@ @echo $(DL)#define HAVE_STRSTR 1$(DL) >> $@ -# @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_SYS_SELECT_H 1$(DL) >> $@ + @echo $(DL)#define HAVE_SYS_PARAM_H 1$(DL) >> $@ @echo $(DL)#define HAVE_SYS_STAT_H 1$(DL) >> $@ @echo $(DL)#define HAVE_SYS_TIME_H 1$(DL) >> $@ @echo $(DL)#define HAVE_TIME_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_UNAME 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) >> $@ @@ -421,7 +415,7 @@ endif @echo $(DL)#define RRDGRAPH_YLEGEND_ANGLE $(RRDGRAPH_YLEGEND_ANGLE)$(DL) >> $@ @echo $(DL)#define strftime strftime_$(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) >> $@ diff --git a/win32/rrd.dsp b/win32/rrd.dsp index b833e55..fbc0c1d 100644 --- a/win32/rrd.dsp +++ b/win32/rrd.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c # SUBTRACT CPP /X /YX # ADD BASE RSC /l 0x100c # ADD RSC /l 0x409 @@ -65,7 +65,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c +# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c # SUBTRACT CPP /X /YX # ADD BASE RSC /l 0x100c # ADD RSC /l 0x409 @@ -217,15 +217,15 @@ SOURCE=..\src\rrd_xport.c # End Source File # Begin Source File -SOURCE=..\src\art_rgba_svp.c +SOURCE=..\src\rrd_getopt.c # End Source File # Begin Source File -SOURCE=..\src\getopt.c +SOURCE=..\src\rrd_getopt1.c # End Source File # Begin Source File -SOURCE=..\src\getopt1.c +SOURCE=..\src\art_rgba_svp.c # End Source File # Begin Source File diff --git a/win32/rrdtool.dsp b/win32/rrdtool.dsp index 006a0ca..1a192fe 100644 --- a/win32/rrdtool.dsp +++ b/win32/rrdtool.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x100c /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c +# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "../src" /I "../../zlib-1.2.3" /I "../../libpng-1.2.16" /I "../../libart_lgpl-2.3.17" /I "../../freetype-2.3.1/include" /D "HAVE_CONFIG_H" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_CTYPE_DISABLE_MACROS" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x100c /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" -- 2.11.0