From 4e2070ef43ba4b3a261204e74aa3fa00c7f542eb Mon Sep 17 00:00:00 2001 From: Dave Beazley Date: Tue, 3 Dec 2002 20:56:45 +0000 Subject: [PATCH] Major cleanup git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4155 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Source/DOH/Doh/.cvsignore | 3 - Source/DOH/Doh/Makefile.in | 54 --------------- Source/DOH/Makefile.in | 67 +++++++++++++------ Source/DOH/{Doh => }/base.c | 0 Source/DOH/{Doh => }/file.c | 0 Source/DOH/{Doh => }/fio.c | 0 Source/DOH/{Doh => }/hash.c | 0 Source/DOH/install-sh | 119 ---------------------------------- Source/DOH/{Doh => }/list.c | 0 Source/DOH/{Doh => }/memory.c | 0 Source/DOH/{Doh => }/string.c | 0 Source/DOH/{Doh => }/void.c | 0 12 files changed, 47 insertions(+), 196 deletions(-) delete mode 100644 Source/DOH/Doh/.cvsignore delete mode 100644 Source/DOH/Doh/Makefile.in rename Source/DOH/{Doh => }/base.c (100%) rename Source/DOH/{Doh => }/file.c (100%) rename Source/DOH/{Doh => }/fio.c (100%) rename Source/DOH/{Doh => }/hash.c (100%) delete mode 100755 Source/DOH/install-sh rename Source/DOH/{Doh => }/list.c (100%) rename Source/DOH/{Doh => }/memory.c (100%) rename Source/DOH/{Doh => }/string.c (100%) rename Source/DOH/{Doh => }/void.c (100%) diff --git a/Source/DOH/Doh/.cvsignore b/Source/DOH/Doh/.cvsignore deleted file mode 100644 index e2255e8a3..000000000 --- a/Source/DOH/Doh/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -*.flc -.deps diff --git a/Source/DOH/Doh/Makefile.in b/Source/DOH/Doh/Makefile.in deleted file mode 100644 index 44078fd2f..000000000 --- a/Source/DOH/Doh/Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ -####################################################################### -# $Header$ -# DOH -####################################################################### - -srcdir = @srcdir@ -VPATH = @srcdir@ - -#.KEEP_STATE: - -# Set your C++ compiler here. g++ works on most machines, -# but you might have to change it depending on your installation. -# -CC = @CC@ -prefix = @prefix@ - -# Comment out the following line if you're on an SGI or don't have ranlib! -RANLIB = @RANLIB@ -AR = @AR@ - -DOHOPT = - -######################################################################## -# Normally, you shouldn't have to change anything below this point # -######################################################################## - -LIBOBJS = void.@OBJEXT@ fio.@OBJEXT@ memory.@OBJEXT@ base.@OBJEXT@ file.@OBJEXT@ list.@OBJEXT@ hash.@OBJEXT@ string.@OBJEXT@ - -LIBSRCS = void.c fio.c memory.c base.c file.c list.c hash.c string.c - -LIBHEADERS = $(srcdir)/../Include/doh.h -LIB = libdoh.a -INCLUDES = -I$(srcdir)/../Include -CFLAGS = @CFLAGS@ -SHELL = /bin/sh - -# -# Rules for creation of a .@OBJEXT@ file from .c -.SUFFIXES: .c -.c.@OBJEXT@: - $(CC) $(DOHOPT) $(INCLUDES) $(CFLAGS) -c -o $*.@OBJEXT@ $< - -all: $(LIB) - -$(LIB): $(LIBOBJS) - @echo "Building library" - $(AR) cr $(LIB) $(LIBOBJS) - $(RANLIB) $(LIB) - cp -f $(LIB) .. - -clean:: - rm -f *.@OBJEXT@ $(LIB) ../$(LIB) -nuke:: - rm -f Makefile *~ diff --git a/Source/DOH/Makefile.in b/Source/DOH/Makefile.in index bfa253c43..f5c6cf371 100644 --- a/Source/DOH/Makefile.in +++ b/Source/DOH/Makefile.in @@ -1,29 +1,56 @@ -############################################################## -# Makefile -# +####################################################################### +# $Header$ # DOH -############################################################## +####################################################################### +srcdir = @srcdir@ +VPATH = @srcdir@ + +#.KEEP_STATE: + +# Set your C++ compiler here. g++ works on most machines, +# but you might have to change it depending on your installation. +# +CC = @CC@ prefix = @prefix@ -exec_prefix= @exec_prefix@ -INCLUDE_DIR = $(prefix)/include -LIB_DIR = $(exec_prefix)/lib +# Comment out the following line if you're on an SGI or don't have ranlib! +RANLIB = @RANLIB@ +AR = @AR@ -# Installer +DOHOPT = -INSTALL = ./install-sh -c -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM= ${INSTALL} -m 755 +######################################################################## +# Normally, you shouldn't have to change anything below this point # +######################################################################## + +LIBOBJS = void.@OBJEXT@ fio.@OBJEXT@ memory.@OBJEXT@ base.@OBJEXT@ file.@OBJEXT@ list.@OBJEXT@ hash.@OBJEXT@ string.@OBJEXT@ + +LIBSRCS = void.c fio.c memory.c base.c file.c list.c hash.c string.c + +LIBHEADERS = $(srcdir)/Include/doh.h +LIB = libdoh.a +INCLUDES = -I$(srcdir)/Include +CFLAGS = @CFLAGS@ +SHELL = /bin/sh + +# +# Rules for creation of a .@OBJEXT@ file from .c +.SUFFIXES: .c +.c.@OBJEXT@: + $(CC) $(DOHOPT) $(INCLUDES) $(CFLAGS) -c -o $*.@OBJEXT@ $< + +all: $(LIB) + +$(LIB): $(LIBOBJS) + @echo "Building library" + $(AR) cr $(LIB) $(LIBOBJS) + $(RANLIB) $(LIB) + +clean:: + rm -f *.@OBJEXT@ $(LIB) ../$(LIB) +nuke:: + rm -f Makefile *~ -all: - cd Doh; $(MAKE) -install: - @echo "Installing $(LIB_DIR)/libdoh.a..." - @$(INSTALL_DATA) libdoh.a $(LIB_DIR)/libdoh.a - @echo "Installing $(INCLUDE_DIR)/doh.h..." - @$(INSTALL_DATA) $(srcdir)/Include/doh.h $(INCLUDE_DIR)/doh.h -clean: - cd Doh; $(MAKE) clean diff --git a/Source/DOH/Doh/base.c b/Source/DOH/base.c similarity index 100% rename from Source/DOH/Doh/base.c rename to Source/DOH/base.c diff --git a/Source/DOH/Doh/file.c b/Source/DOH/file.c similarity index 100% rename from Source/DOH/Doh/file.c rename to Source/DOH/file.c diff --git a/Source/DOH/Doh/fio.c b/Source/DOH/fio.c similarity index 100% rename from Source/DOH/Doh/fio.c rename to Source/DOH/fio.c diff --git a/Source/DOH/Doh/hash.c b/Source/DOH/hash.c similarity index 100% rename from Source/DOH/Doh/hash.c rename to Source/DOH/hash.c diff --git a/Source/DOH/install-sh b/Source/DOH/install-sh deleted file mode 100755 index 0ff4b6a08..000000000 --- a/Source/DOH/install-sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh - -# -# install - install a program, script, or datafile -# This comes from X11R5; it is not part of GNU. -# -# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $ -# -# This script is compatible with the BSD install script, but was written -# from scratch. -# - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" - -instcmd="$mvprog" -chmodcmd="" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -fi - -if [ x"$dst" = x ] -then - echo "install: no destination specified" - exit 1 -fi - - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - -if [ -d $dst ] -then - dst="$dst"/`basename $src` -fi - -# Make a temp file name in the proper directory. - -dstdir=`dirname $dst` -dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - -$doit $instcmd $src $dsttmp - -# and set any options; do chmod last to preserve setuid bits - -if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi -if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi -if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi -if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi - -# Now rename the file to the real destination. - -$doit $rmcmd $dst -$doit $mvcmd $dsttmp $dst - - -exit 0 diff --git a/Source/DOH/Doh/list.c b/Source/DOH/list.c similarity index 100% rename from Source/DOH/Doh/list.c rename to Source/DOH/list.c diff --git a/Source/DOH/Doh/memory.c b/Source/DOH/memory.c similarity index 100% rename from Source/DOH/Doh/memory.c rename to Source/DOH/memory.c diff --git a/Source/DOH/Doh/string.c b/Source/DOH/string.c similarity index 100% rename from Source/DOH/Doh/string.c rename to Source/DOH/string.c diff --git a/Source/DOH/Doh/void.c b/Source/DOH/void.c similarity index 100% rename from Source/DOH/Doh/void.c rename to Source/DOH/void.c