From: David B. <ad...@us...> - 2006-08-25 19:50:12
|
Update of /cvsroot/octave/octave-forge/main/octcdf/src In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7861/main/octcdf/src Modified Files: Makefile autogen.sh configure.base Removed Files: install-sh octinst.sh.in Log Message: Latest package manager mega patch, but not the last --- install-sh DELETED --- Index: Makefile =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/src/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 25 Aug 2006 06:52:59 -0000 1.2 +++ Makefile 25 Aug 2006 19:49:39 -0000 1.3 @@ -4,8 +4,6 @@ # assumptions to make if not using ./configure script ifndef OCTAVE_FORGE MKOCTFILE=mkoctfile - MKOCTLINK=ln -s - OCTLINK=.oct # Adapt the variables NETCDF_INC and NETCDF_LIB # for octcdf with NetCDF support only (and not OPeNDAP). @@ -39,14 +37,9 @@ NCSOURCES = ov-netcdf.cc ov-ncfile.cc ov-ncvar.cc ov-ncatt.cc ov-ncdim.cc OBJECTS = $(patsubst %.cc,%.o,$(NCSOURCES)) -NCLINKTARGETS = $(patsubst %,%$(OCTLINK), \ - ncclose ncredef ncenddef ncsync ncvar ncatt \ - ncdim ncname ncdatatype ncautonan ncautoscale) - - MFILES = ncchar.m ncfloat.m nclong.m ncbyte.m ncdouble.m ncint.m ncshort.m -TARGETS = $(NCTARGET) $(NCLINKTARGETS) +TARGETS = $(NCTARGET) MOFLAGS = $(OCTCDF_CFLAGS) @@ -61,16 +54,11 @@ all: $(TARGETS) else all: - @echo "netcdf libraries or headers missing" - false + @echo "*** netcdf libraries or headers missing"; false endif mfiles: $(MFILES) -$(NCLINKTARGETS) : $(NCTARGET) - $(RM) $@ ; \ - $(MKOCTLINK) $(NCTARGET) $@ - ov-netcdf.o ov-ncfile.o ov-ncvar.o ov-ncatt.o ov-ncdim.o: ov-netcdf.h ov-ncfile.h ov-ncvar.h ov-ncatt.h ov-ncdim.h $(NCTARGET) : $(OBJECTS) @@ -83,5 +71,5 @@ $(MFILES): nctype.m4 m4 --define=TYPE=$(patsubst nc%.m,%,$@) nctype.m4 > $@ -clean: ; -$(RM) *.o core* octave-core *.oct *.octlink *~ *.nc +clean: ; -$(RM) *.o core* octave-core *.oct *~ *.nc --- octinst.sh.in DELETED --- Index: autogen.sh =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/src/autogen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- autogen.sh 25 Aug 2006 06:52:59 -0000 1.2 +++ autogen.sh 25 Aug 2006 19:49:39 -0000 1.3 @@ -7,7 +7,7 @@ cat <<EOF >> configure.in AC_OUTPUT(\$CONFIGURE_OUTPUTS) dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions - chmod 0771 octinst.sh + echo " " echo " \"\\\$prefix\" is \$prefix" echo " \"\\\$exec_prefix\" is \$exec_prefix" Index: configure.base =================================================================== RCS file: /cvsroot/octave/octave-forge/main/octcdf/src/configure.base,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- configure.base 25 Aug 2006 06:52:59 -0000 1.2 +++ configure.base 25 Aug 2006 19:49:39 -0000 1.3 @@ -268,7 +268,7 @@ OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT) AC_PROG_LN_S -AC_PROG_INSTALL + AC_PROG_RANLIB dnl Use $(COPY_FLAGS) to set options for cp when installing .oct files. @@ -336,7 +336,7 @@ OCTCDFSTATUS=no fi -CONFIGURE_OUTPUTS="Makeconf octinst.sh" +CONFIGURE_OUTPUTS="Makeconf" STATUS_MSG=" octave commands will install into the following directories: m-files: $mpath |