From a21934ecd53acee5008fe129cc7968f570b9ed64 Mon Sep 17 00:00:00 2001 From: Ulrik Haugen Date: Mon, 20 May 2019 13:09:51 +0200 Subject: [PATCH] Remove extraneous files --- common/Makefile.in | 5 - common/configure.scan | 20 --- common/include/.#r_macros.h.1.2 | 106 ------------ common/lib/rb_local.mk | 280 -------------------------------- null/Makefile | 0 ssl/Makefile | 20 --- 6 files changed, 431 deletions(-) delete mode 100644 common/Makefile.in delete mode 100644 common/configure.scan delete mode 100644 common/include/.#r_macros.h.1.2 delete mode 100644 common/lib/rb_local.mk delete mode 100644 null/Makefile delete mode 100644 ssl/Makefile diff --git a/common/Makefile.in b/common/Makefile.in deleted file mode 100644 index 9506951..0000000 --- a/common/Makefile.in +++ /dev/null @@ -1,5 +0,0 @@ -OBJECTS=r_assoc.o r_data.o r_errors.o r_list.c r_time.o -INCLUDES += ../includes -OBJECTS: - $(CC) $(CFLAGS) $(@:%.c - diff --git a/common/configure.scan b/common/configure.scan deleted file mode 100644 index 4d9218c..0000000 --- a/common/configure.scan +++ /dev/null @@ -1,20 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(include/r_assoc.h) - -dnl Checks for programs. -AC_PROG_CC - -dnl Checks for libraries. - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(sys/time.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_TIME - -dnl Checks for library functions. -AC_FUNC_MEMCMP -AC_FUNC_VPRINTF - -AC_OUTPUT(make/freebsd31/Makefile make/freebsd22/Makefile make/sunos413/Makefile) diff --git a/common/include/.#r_macros.h.1.2 b/common/include/.#r_macros.h.1.2 deleted file mode 100644 index 20c9b1d..0000000 --- a/common/include/.#r_macros.h.1.2 +++ /dev/null @@ -1,106 +0,0 @@ -/** - r_macros.h - - - Copyright (C) 1999-2000 RTFM, Inc. - All Rights Reserved - - This package is a SSLv3/TLS protocol analyzer written by Eric Rescorla - and licensed by RTFM, Inc. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - - This product includes software developed by Eric Rescorla for - RTFM, Inc. - - 4. Neither the name of RTFM, Inc. nor the name of Eric Rescorla may be - used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY ERIC RESCORLA AND RTFM, INC. ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY SUCH DAMAGE. - - $Id: r_macros.h,v 1.2 2000/10/17 16:09:59 ekr Exp $ - - - ekr@rtfm.com Tue Dec 22 10:37:32 1998 - */ - - -#ifndef _r_macros_h -#define _r_macros_h - -#if (R_USE_PROTOTYPES==1) -#define PROTO_LIST(a) a -#else -#define PROTO_LIST(a) () -#endif - -#ifndef __GNUC__ -#define __FUNCTION__ "unknown" -#endif - -#ifdef R_TRACE_ERRORS -#define REPORT_ERROR_(caller,a) fprintf(stderr,"%s: error %d at %s:%d (function %s)\n", \ - caller,a,__FILE__,__LINE__,__FUNCTION__) -#else -#define REPORT_ERROR_(caller,a) -#endif - -#ifndef ERETURN -#define ERETURN(a) do {int _r=a; if(!_r) _r=-1; REPORT_ERROR_("ERETURN",_r); return(_r);} while(0) -#endif - -#ifndef ABORT -#define ABORT(a) do { int _r=a; if(!_r) _r=-1; REPORT_ERROR_("ABORT",_r); _status=_r; goto abort;} while(0) -#endif - -#ifndef FREE -#define FREE(a) if(a) free(a) -#endif -#ifndef MIN -#define MIN(a,b) ((a)>(b))?(b):(a) -#endif - -#ifndef MAX -#define MAX(a,b) ((b)>(a))?(b):(a) -#endif - -#ifdef DEBUG -#define DBG(a) debug a -int debug(int class,char *format,...); -#else -#define DBG(a) -#endif - -#ifndef RMALLOC -#define RMALLOC(a) malloc(A) -#endif - -#ifndef RCALLOC -#define RCALLOC(a) calloc(1,a) -#endif - -#ifndef RFREE -#define RFREE(a) if(a) free(a) -#endif - -#endif - diff --git a/common/lib/rb_local.mk b/common/lib/rb_local.mk deleted file mode 100644 index a44df54..0000000 --- a/common/lib/rb_local.mk +++ /dev/null @@ -1,280 +0,0 @@ -# -# rb_local.mk -# -# $Source$ -# $Revision$ -# $Date$ -# $Name$ -# $Disclaimer$ -# -# Copyright (C) 2001, Terisa Systems, Inc. -# All Rights Reserved. -# -# ekr@terisa.com -# - - - -# -# CONFIGURE USER-DEFINED MAKE ENVIRONMENT -# -# These fields are specified by the user. The remainder of -# this file is generated from this user-specified information. -# -# COMMON_LIB_DEFINES: -# cpp defines, with the -D flag preceeding each -# -# COMMON_LIB_INCLUDES: -# cpp include directories, with the -I flag preceeding each -# -# COMMON_LIB_INTERNAL: -# headers files which are local to a specific module directory, -# and should not be used by other parts of the toolkit or by -# the user -# -# COMMON_LIB_LIBNAME: -# the library associated with this module directory, used in -# most cases for debugging purposes -# -# COMMON_LIB_LIBPATHS: -# link-time directories to search for libraries, with the -L flag -# preceeding each -# -# COMMON_LIB_LIBRARIES: -# link-time libraries, with the -l flag preceeding each -# -# COMMON_LIB_LOCALFLAGS: -# compile-time flags specific to compiling only the files in -# this module directory--this variable should only be set in -# extremely exceptional cases -# -# COMMON_LIB_MAKEFILES: -# the makefiles -# -# COMMON_LIB_PREFIX: -# defines the module name, which also serves as the -# prefix for all the variable names defined in this file -# -# COMMON_LIB_PRIVATE: -# the private, for-toolkit-use-only API header files -# -# COMMON_LIB_PROGRAMS: -# programs to build -# -# COMMON_LIB_PUBLIC: -# the header files that define the public API for the toolkit -# and any other 'public' files that should be copied to -# the build directory -# -# COMMON_LIB_SOURCES: -# the source files to compile to object -# -COMMON_LIB_DEFINES = -COMMON_LIB_INCLUDES = -COMMON_LIB_INTERNAL = -COMMON_LIB_LIBNAME = libcommon.$(LIBSUFFIX) -COMMON_LIB_LIBPATHS = -COMMON_LIB_LIBRARIES = -COMMON_LIB_LOCALFLAGS = -COMMON_LIB_MAKEFILES = targets.mk -COMMON_LIB_PREFIX = COMMON_LIB -COMMON_LIB_PRIVATE = -COMMON_LIB_PROGRAMS = -COMMON_LIB_PUBLIC = -COMMON_LIB_SOURCES = debug.c r_assoc.c r_bitfield.c r_data.c \ - r_errors.c r_list.c r_replace.c r_time.c - - - -# -# CONFIGURE AUTOMATICALLY-GENERATED MAKE ENVIRONMENT -# -# COMMON_LIB_OBJECTS: -# object files to build -# -# COMMON_LIB_UNUSED: -# obsolete files in the module directory that are not -# used during the build process -# -# COMMON_LIB_USED: -# all files in the module directory that are used -# during the build process -# -COMMON_LIB_OBJECTS = debug.$(OBJSUFFIX) r_assoc.$(OBJSUFFIX) \ - r_bitfield.$(OBJSUFFIX) r_data.$(OBJSUFFIX) \ - r_errors.$(OBJSUFFIX) r_list.$(OBJSUFFIX) \ - r_replace.$(OBJSUFFIX) r_time.$(OBJSUFFIX) -COMMON_LIB_UNUSED = assoc.h debug.h local.mk r_assoc_test.c r_data.h \ - rb_local.mk -COMMON_LIB_USED = $(COMMON_LIB_INTERNAL:%=$(COMMON_LIB_SRCDIR)%) \ - $(COMMON_LIB_MAKEFILES:%=$(COMMON_LIB_SRCDIR)%) \ - $(COMMON_LIB_PRIVATE:%=$(COMMON_LIB_SRCDIR)%) \ - $(COMMON_LIB_PUBLIC:%=$(COMMON_LIB_SRCDIR)%) \ - $(COMMON_LIB_SOURCES:%=$(COMMON_LIB_SRCDIR)%) - - - -# -# NOTES -# -# The following variables may be used during the build process, -# but are not defined in this file. If they are to be set -# to something other than the default blank, then they must -# be set by the calling make system. -# -# COMMON_LIB_SRCDIR: -# if the build target directory is different from the -# module directory (the source directory), then this -# variable contains the relative or full path of -# the module directory -# -# LIBARS: -# the library archive files (with fully-specified paths) that -# executables built from this module directory depend upon -# -# LIBPATHS: -# the paths to search for library archives (specified with -# the -L) -# -# LIBRARIES: -# the libraries to use while building executables from -# this module directory (specified with the -l) -# - - - -# -# GLOBAL ENVIRONMENT -# -DEFINES += $(COMMON_LIB_DEFINES) -INCLUDES += $(COMMON_LIB_INCLUDES) -LIBPATHS += $(COMMON_LIB_LIBPATHS) -LIBRARIES += $(COMMON_LIB_LIBRARIES) -OBJECTS += $(COMMON_LIB_OBJECTS) -PUBLIC += $(COMMON_LIB_PUBLIC) - - - -# -# GENERIC DEPENDENCIES -# -# default: -# default dependency, must be the first dependency in this makefile -# -# all: -# build everything in this module directory -# -# build: -# make only the toolkit build files of this module directory -# -# ci: -# perform an RCS check-in of this module directory -# -# clean: -# remove the compiled files -# -# clean_public: -# remove the public header files that have been copied -# to a public build directory -# -# objects: -# build the object files (this dependency is used for -# building the toolkit library) -# -# private: -# build only the private API header files -# -# public: -# build only the public API header files -# -default: $(COMMON_LIB_LIBNAME) -default: $(COMMON_LIB_PROGRAMS) - -all: $(COMMON_LIB_PUBLIC) -all: $(COMMON_LIB_OBJECTS) -all: $(COMMON_LIB_LIBNAME) -all: $(COMMON_LIB_PROGRAMS) -build: $(COMMON_LIB_PUBLIC) -build: $(COMMON_LIB_OBJECTS) -ci: common_lib_ci -clean: common_lib_clean -clean_public: common_lib_clean_public -objects: $(COMMON_LIB_OBJECTS) -private: $(COMMON_LIB_PRIVATE) -public: $(COMMON_LIB_PUBLIC) - - - -# -# LOCAL UTILITY DEPENDENCIES -# -# utility dependencies are necessary because of some -# make-isms having to do with dependencies -# - -common_lib_ci: - $(CI) $(CIFLAGS) $(COMMON_LIB_USED) - -common_lib_clean: - $(RM) $(RMFLAGS) $(COMMON_LIB_OBJECTS) $(COMMON_LIB_LIBNAME) $(COMMON_LIB_PROGRAMS) - -common_lib_clean_public: - $(RM) $(RMFLAGS) $(COMMON_LIB_PUBLIC) - -common_lib_objects: $(COMMON_LIB_OBJECTS) - -common_lib_programs: $(COMMON_LIB_PROGRAMS) - -common_lib_public: $(COMMON_LIB_PUBLIC) - - - -# -# BUILD DEPENDENCIES -# -# build dependencies invoke the rule used to build each -# class of file -# - -$(COMMON_LIB_LIBNAME): - $(AR) $(ARFLAGS) $@ $? - $(RANLIB) $@ - -$(COMMON_LIB_OBJECTS): - $(COMPILE.c) $(COMMON_LIB_SRCDIR)$(@:%.$(OBJSUFFIX)=%.c) $(DEFINES) $(INCLUDES) $(COMMON_LIB_LOCALFLAGS) - -$(COMMON_LIB_PUBLIC): - $(CP) $(CPFLAGS) $(COMMON_LIB_SRCDIR)$@ $@ - -$(COMMON_LIB_PROGRAMS): - $(LINK.c) $@.$(OBJSUFFIX) $(LDLIBS) $(LIBS) $(LIBRARIES) $(LIBPATHS) -#LIBS above is obsolete (use LIBARARIES instead) - - - -# -# FILE DEPENDENCIES -# -# file dependencies state, for each file that is built, -# which file(s) it depends upon -# - -debug.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)debug.h -debug.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)debug.c - -r_assoc.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)r_assoc.c - -r_bitfield.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)r_bitfield.c - -r_data.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)r_data.h -r_data.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)r_data.c - -r_errors.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)r_errors.c - -r_list.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)r_list.c - -r_replace.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)r_replace.c - -r_time.$(OBJSUFFIX): $(COMMON_LIB_SRCDIR)r_time.c - -$(COMMON_LIB_LIBNAME): $(COMMON_LIB_OBJECTS) diff --git a/null/Makefile b/null/Makefile deleted file mode 100644 index e69de29..0000000 diff --git a/ssl/Makefile b/ssl/Makefile deleted file mode 100644 index dd76f59..0000000 --- a/ssl/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -CC=gcc -g -I../../common/include -DYYDEBUG=1 -YACC=bison -d -y -v -LEX=flex -OBJS=lex.yy.o y.tab.o main.o - -default: all - -lex.yy.c: ssl.l - $(LEX) ssl.l - -y.tab.c: ssl.y - $(YACC) ssl.y - -grammar: y.tab.c lex.yy.c - $(LEX) ssl.l - $(YACC) ssl.y - -all: grammar $(OBJS) - $(CC) $(OBJS) -L../../common/make/freebsd31 -ly -lm -