From 8d5eaa92ecedb58a6255504d6479ac2bc0b6e255 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Dec 2000 15:07:35 +0000 Subject: [PATCH] - Removed smake build and autoconf from the libraries. - Removed unused files. --- libargv/.cvsignore | 1 + libargv/Makefile | 7 +++++- libconfigfile/Makefile | 30 +++++++++++++++++++++++++ libconfigfile/SMakefile | 12 ---------- libconfigfile/configure.in | 28 ----------------------- liblists/Makefile | 26 ++++++++++++++++++++++ liblists/SMakefile | 15 ------------- liblists/configure.in | 33 --------------------------- liblists/{lists.h.in => lists.h} | 6 ----- libtext/Makefile | 38 ++++++++++++++++++++++++++++++++ libtext/SMakefile | 13 ----------- libtext/configure.in | 28 ----------------------- libtext/test.txt | 14 ------------ 13 files changed, 101 insertions(+), 150 deletions(-) create mode 100644 libargv/.cvsignore create mode 100644 libconfigfile/Makefile delete mode 100644 libconfigfile/SMakefile delete mode 100644 libconfigfile/configure.in create mode 100644 liblists/Makefile delete mode 100644 liblists/SMakefile delete mode 100644 liblists/configure.in rename liblists/{lists.h.in => lists.h} (95%) create mode 100644 libtext/Makefile delete mode 100644 libtext/SMakefile delete mode 100644 libtext/configure.in delete mode 100644 libtext/test.txt diff --git a/libargv/.cvsignore b/libargv/.cvsignore new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/libargv/.cvsignore @@ -0,0 +1 @@ +test diff --git a/libargv/Makefile b/libargv/Makefile index a195c7e..6df0787 100644 --- a/libargv/Makefile +++ b/libargv/Makefile @@ -26,4 +26,9 @@ test: test.o libargv.a $(CC) $(LDFLAGS) test.o libargv.a -o test realclean distclean clean:: - rm -f argv.o libargv.o test.o test + rm -f libargv.a argv.o test.o test + +# Dependencies + +argv.o: argv.h argv_loc.h +test.o: argv.h diff --git a/libconfigfile/Makefile b/libconfigfile/Makefile new file mode 100644 index 0000000..3a25cb9 --- /dev/null +++ b/libconfigfile/Makefile @@ -0,0 +1,30 @@ +# +# Build the libconfigfile library. +# +# $Header$ +# + +CC = gcc +AR = ar +RANLIB = ranlib + +CFLAGS = -Wall -pedantic -O3 +CPPFLAGS = +LDFLAGS = + +.SUFFIXES: +.SUFFIXES: .c .o .a + +.c.o: + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + +libconfigfile.a: config.o + $(AR) cr libconfigfile.a config.o + $(RANLIB) libconfigfile.a + +realclean distclean clean:: + rm -f libconfigfile.a config.o + +# Dependencies + +config.o: ../liblists/lists.h ../libtext/text.h configfile.h diff --git a/libconfigfile/SMakefile b/libconfigfile/SMakefile deleted file mode 100644 index 2e37953..0000000 --- a/libconfigfile/SMakefile +++ /dev/null @@ -1,12 +0,0 @@ -# -# Skeleton Makefile -- process with smake to create real Makefile. -# -# $Header$ -# -.opt -o GNUmakefile.in - -LIBRARY = configfile -SRCS = config.c - -.include -.include diff --git a/libconfigfile/configure.in b/libconfigfile/configure.in deleted file mode 100644 index d6dfabd..0000000 --- a/libconfigfile/configure.in +++ /dev/null @@ -1,28 +0,0 @@ -dnl -dnl configure.in -- Process this file with autoconf to produce a configure script. -dnl -dnl $Header$ -dnl - -AC_INIT(configfile.h) - -dnl Checks for paths and programs. -dnl -AC_PROG_CC -AC_PROG_RANLIB - -dnl Enable warning flags for gcc. -dnl -if test "$GCC" = yes; then - CFLAGS="$CFLAGS -Wall -pedantic" - CXXFLAGS="$CXXFLAGS -Wall -pedantic" -fi - -dnl Remove '-g' and '-O2' from the compile flags. -dnl -CFLAGS=`echo $CFLAGS | sed -e "s/-g//" -e "s/-O2//"` -CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g//" -e "s/-O2//"` - -dnl Write results. -dnl -AC_OUTPUT(GNUmakefile) diff --git a/liblists/Makefile b/liblists/Makefile new file mode 100644 index 0000000..9bd40ef --- /dev/null +++ b/liblists/Makefile @@ -0,0 +1,26 @@ +# +# Build the liblists library. +# +# $Header$ +# + +CC = gcc +AR = ar +RANLIB = ranlib + +CFLAGS = -Wall -pedantic -O3 +CPPFLAGS = +LDFLAGS = + +.SUFFIXES: +.SUFFIXES: .c .o .a + +.c.o: + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + +liblists.a: lists.o + $(AR) cr liblists.a lists.o + $(RANLIB) liblists.a + +realclean distclean clean:: + rm -f liblists.a lists.o diff --git a/liblists/SMakefile b/liblists/SMakefile deleted file mode 100644 index f39dde4..0000000 --- a/liblists/SMakefile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Skeleton Makefile -- process with smake to create real Makefile. -# -# $Header$ -# -.opt -o GNUmakefile.in - -LIBRARY = lists -SRCS = lists.c - -.include -.include - -distclean-local:: - rm -f lists.h diff --git a/liblists/configure.in b/liblists/configure.in deleted file mode 100644 index e32c251..0000000 --- a/liblists/configure.in +++ /dev/null @@ -1,33 +0,0 @@ -dnl -dnl configure.in -- Process this file with autoconf to produce a configure script. -dnl -dnl $Header$ -dnl - -AC_INIT(lists.h.in) - -dnl Checks for paths and programs. -dnl -AC_PROG_CC -AC_PROG_RANLIB - -dnl Check for optional header files. -dnl -AC_CHECK_HEADERS(strings.h) - -dnl Enable warning flags for gcc. -dnl -if test "$GCC" = yes; then - CFLAGS="$CFLAGS -Wall -pedantic" - CXXFLAGS="$CXXFLAGS -Wall -pedantic" -fi - -dnl Remove '-g' and '-O2' from the compile flags. -dnl -CFLAGS=`echo $CFLAGS | sed -e "s/-g//" -e "s/-O2//"` -CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g//" -e "s/-O2//"` - -dnl Write results. -dnl -AC_CONFIG_HEADER(lists.h) -AC_OUTPUT(GNUmakefile) diff --git a/liblists/lists.h.in b/liblists/lists.h similarity index 95% rename from liblists/lists.h.in rename to liblists/lists.h index 8cd4440..3ceda42 100644 --- a/liblists/lists.h.in +++ b/liblists/lists.h @@ -25,14 +25,8 @@ #ifndef __LIB_LISTS_H__ #define __LIB_LISTS_H__ 1 -/* For autoconf... */ -#undef HAVE_STRINGS_H - #include #include -#ifdef HAVE_STRINGS_H /* sunos 4 needs this */ -# include -#endif #include #ifdef DEBUG_DMALLOC # include diff --git a/libtext/Makefile b/libtext/Makefile new file mode 100644 index 0000000..73b73dc --- /dev/null +++ b/libtext/Makefile @@ -0,0 +1,38 @@ +# +# Build the libtext library. +# +# $Header$ +# + +CC = gcc +AR = ar +RANLIB = ranlib + +CFLAGS = -Wall -pedantic -O3 +CPPFLAGS = +LDFLAGS = + +OBJECTS = easy_pattern_match.o find_next_line.o find_string.o \ + easy_sprintf.o transform_text.o wordwrap.o + +.SUFFIXES: +.SUFFIXES: .c .o .a + +.c.o: + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< + +libtext.a: $(OBJECTS) + $(AR) cr libtext.a $(OBJECTS) + $(RANLIB) libtext.a + +realclean distclean clean:: + rm -f libtext.a $(OBJECTS) + +# Dependencies + +easy_pattern_match.o: text.h +easy_sprintf.o: text.h +find_next_line.o: text.h +find_string.o: text.h +transform_text.o: text.h +wordwrap.o: text.h diff --git a/libtext/SMakefile b/libtext/SMakefile deleted file mode 100644 index c0584f2..0000000 --- a/libtext/SMakefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# Skeleton Makefile -- process with smake to create real Makefile. -# -# $Header$ -# -.opt -o GNUmakefile.in - -LIBRARY = text -SRCS = easy_pattern_match.c find_next_line.c find_string.c easy_sprintf.c \ - transform_text.c wordwrap.c - -.include -.include diff --git a/libtext/configure.in b/libtext/configure.in deleted file mode 100644 index 66cf5e0..0000000 --- a/libtext/configure.in +++ /dev/null @@ -1,28 +0,0 @@ -dnl -dnl configure.in -- Process this file with autoconf to produce a configure script. -dnl -dnl $Header$ -dnl - -AC_INIT(text.h) - -dnl Checks for paths and programs. -dnl -AC_PROG_CC -AC_PROG_RANLIB - -dnl Enable warning flags for gcc. -dnl -if test "$GCC" = yes; then - CFLAGS="$CFLAGS -Wall -pedantic" - CXXFLAGS="$CXXFLAGS -Wall -pedantic" -fi - -dnl Remove '-g' and '-O2' from the compile flags. -dnl -CFLAGS=`echo $CFLAGS | sed -e "s/-g//" -e "s/-O2//"` -CXXFLAGS=`echo $CXXFLAGS | sed -e "s/-g//" -e "s/-O2//"` - -dnl Write results. -dnl -AC_OUTPUT(GNUmakefile) diff --git a/libtext/test.txt b/libtext/test.txt deleted file mode 100644 index 31f0c64..0000000 --- a/libtext/test.txt +++ /dev/null @@ -1,14 +0,0 @@ -Ein Wort ist kein Satz, - aber ein Satz ist kein Ersatz für ein Wort. - "Das Wort" ist der "Ein Satz" im "Vor Wort". -Dagegen kommt das "Vor Spiel" vor dem Spiel, - obwohl das eigentliche "Kommen" im Spiel stattfindet. -So gesehen, ist das "Vor Spiel" ein richtiges Spiel, - während das sogenannte Spiel der "Volle Ernst" ist. -Andererseits, wenn Ernst voll ist, findet meist weder "Vor Spiel" noch ein Spiel statt. -Dieses Spiel hatte dann schon vorher stattgefunden; - Meistens war es dann ein Lokaltermin des "Fußball Clubs Bayern". -Darauf folgte ein Termin im Lokal; Nach dem Fußballspiel zog Ernst das Lokal - der "Oben ohne Bar" vor; -Denn in der Bar ging nichts ohne, weder ohne das eine, noch ohne unten. -Des weiteren hatte ein Besuch in der Bar für Ernst meist ein "Nach Spiel" zu Hause.