Index: ossp-pkg/l2/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/l2/Makefile.in,v rcsdiff -q -kk '-r1.37' '-r1.38' -u '/v/ossp/cvs/ossp-pkg/l2/Makefile.in,v' 2>/dev/null --- Makefile.in 2001/11/10 14:01:47 1.37 +++ Makefile.in 2001/12/22 21:51:56 1.38 @@ -42,9 +42,7 @@ # build tools CC = @CC@ -CXX = @CXX@ CFLAGS = @CFLAGS@ -I. -CXXFLAGS = @CXXFLAGS@ -I. LDFLAGS = @LDFLAGS@ -L. LIBS = @LIBS@ AR = @AR@ @@ -59,9 +57,9 @@ LIBTOOL = ./libtool TARGET = $(TARGET_LIBS) $(TARGET_MANS) $(TARGET_PROGS) -TARGET_LIBS = libl2.la @LIBL2XX_LA@ -TARGET_MANS = l2tool.1 l2-config.1 l2.3 @L2XX_3@ -TARGET_PROGS = l2tool l2_test @L2_TESTXX@ +TARGET_LIBS = libl2.la +TARGET_MANS = l2tool.1 l2-config.1 l2.3 +TARGET_PROGS = l2tool l2_test # list of library object files OBJS = \ @@ -129,12 +127,8 @@ .SUFFIXES: .c .cc .o .lo .c.o: $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -.cc.o: - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< .c.lo: $(LIBTOOL) --mode=compile --quiet $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -.cc.lo: - $(LIBTOOL) --mode=compile --quiet $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< # default target all: $(TARGET) @@ -143,9 +137,6 @@ libl2.la: $(OBJS) $(LIBTOOL) --mode=link --quiet $(CC) -o libl2.la $(OBJS) -rpath $(libdir) \ -version-info `$(SHTOOL) version -l c -d libtool l2_version.c` -libl2++.la: $(OBJS) l2++.lo - $(LIBTOOL) --mode=link --quiet $(CC) -o libl2++.la $(OBJS) l2++.lo -rpath $(libdir) \ - -version-info `$(SHTOOL) version -l c -d libtool l2_version.c` # build regex library l2_ut_pcre.lo: l2_ut_pcre.tab l2_ut_pcre.c @@ -167,8 +158,6 @@ $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o l2tool l2tool.o libl2.la $(LIBS) l2_test: l2_test.o libl2.la $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o l2_test l2_test.o libl2.la $(LIBS) -l2_test++: l2_test++.o libl2++.la - $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o l2_test++ l2_test++.o libl2++.la $(LIBS) l2_sockmon: l2_sockmon.o $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o l2_sockmon l2_sockmon.o $(LIBS) @@ -185,22 +174,15 @@ BASENAME="l2"; SEC=3; \ NAME="L2"; ONELINE="Logging Library"; \ $(_MANPAGE) -l2++.3: l2++.pod l2_version.c - BASENAME="l2++"; SEC=3; \ - NAME="L2"; ONELINE="Logging Library (C++)"; \ - $(_MANPAGE) # (minimalistic) test suite check: test -test: all test-c @TEST_CXX@ -test-c: +test: all $(LIBTOOL) --mode=execute ./l2_test -test-cxx: - $(LIBTOOL) --mode=execute ./l2_test++ # perform standard installation procedure install: all - $(MAKE) $(MFLAGS) install-std install-c @INSTALL_CXX@ + $(MAKE) $(MFLAGS) install-std install-c install-std: $(SHTOOL) mkdir -p -f -m 755 $(DESTDIR)$(bindir) $(SHTOOL) mkdir -p -f -m 755 $(DESTDIR)$(includedir) @@ -216,19 +198,10 @@ $(SHTOOL) install -c -m 644 l2.h $(DESTDIR)$(includedir)/l2.h @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 \ libl2.la $(DESTDIR)$(libdir)/libl2.la -install-cxx: - $(SHTOOL) install -c -m 644 l2++.3 $(DESTDIR)$(mandir)/man3/l2++.3 - $(SHTOOL) install -c -m 644 l2++.h $(DESTDIR)$(includedir)/l2++.h - @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 \ - libl2++.la $(DESTDIR)$(libdir)/libl2++.la # perform standard uninstallation procedure uninstall: - $(MAKE) $(MFLAGS) @UNINSTALL_CXX@ uninstall-c uninstall-std -uninstall-cxx: - @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libl2++.la - $(RM) $(DESTDIR)$(includedir)/l2++.h - $(RM) $(DESTDIR)$(mandir)/man3/l2++.3 + $(MAKE) $(MFLAGS) uninstall-c uninstall-std uninstall-c: @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libl2.la $(RM) $(DESTDIR)$(includedir)/l2.h @@ -276,7 +249,6 @@ $(RM) l2-config.1 $(RM) l2_config.h.in $(RM) l2.3 - $(RM) l2++.3 $(RM) l2_spec_scan.c $(RM) l2_spec_parse.c l2_spec_parse.h Index: ossp-pkg/l2/aclocal.m4 RCS File: /v/ossp/cvs/ossp-pkg/l2/aclocal.m4,v rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/l2/aclocal.m4,v' 2>/dev/null --- aclocal.m4 2001/11/08 20:28:22 1.8 +++ aclocal.m4 2001/12/22 21:51:56 1.9 @@ -165,10 +165,6 @@ *-g* ) CFLAGS=`echo "$CFLAGS" |\ sed -e 's/ -g / /g' -e 's/ -g$//' -e 's/^-g //g' -e 's/^-g$//'` ;; esac -case "$CXXFLAGS" in - *-g* ) CXXFLAGS=`echo "$CXXFLAGS" |\ - sed -e 's/ -g / /g' -e 's/ -g$//' -e 's/^-g //g' -e 's/^-g$//'` ;; -esac msg=disabled ])dnl AC_MSG_CHECKING(for compilation debug mode) Index: ossp-pkg/l2/configure.ac RCS File: /v/ossp/cvs/ossp-pkg/l2/configure.ac,v rcsdiff -q -kk '-r1.15' '-r1.16' -u '/v/ossp/cvs/ossp-pkg/l2/configure.ac,v' 2>/dev/null --- configure.ac 2001/11/08 20:28:22 1.15 +++ configure.ac 2001/12/22 21:51:56 1.16 @@ -40,37 +40,8 @@ AC_PREFIX_DEFAULT(/usr/local) AC_PLATFORM(PLATFORM) -AC_MSG_CHECKING(whether to build C++ library) -LIBL2XX_LA="" -L2_TESTXX="" -L2XX_3="" -TEST_CXX="" -INSTALL_CXX="" -UNINSTALL_CXX="" -AC_ARG_WITH(cxx,dnl -[ --with-cxx build C++ library (default=no)],[ - LIBL2XX_LA="libl2++.la" - L2_TESTXX="l2_test++" - L2XX_3="l2++.3" - TEST_CXX=test-cxx - INSTALL_CXX=install-cxx - UNINSTALL_CXX=uninstall-cxx -],[ - with_cxx=no -])dnl -AC_MSG_RESULT([$with_cxx]) -AC_SUBST(LIBL2XX_LA) -AC_SUBST(L2_TESTXX) -AC_SUBST(L2XX_3) -AC_SUBST(TEST_CXX) -AC_SUBST(INSTALL_CXX) -AC_SUBST(UNINSTALL_CXX) - AC_SET_MAKE AC_PROG_CC -if test ".$with_cxx" = .yes; then - AC_PROG_CXX -fi AC_PROG_CPP AC_CHECK_DEBUGGING AC_CHECK_MAINTAINER Index: ossp-pkg/l2/l2++.cc RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2++.cc,v co -q -kk -p'1.2' '/v/ossp/cvs/ossp-pkg/l2/Attic/l2++.cc,v' | diff -u - /dev/null -L'ossp-pkg/l2/l2++.cc' 2>/dev/null --- ossp-pkg/l2/l2++.cc +++ /dev/null 2024-04-27 03:44:01.000000000 +0200 @@ -1,33 +0,0 @@ -/* -** L2 - OSSP Logging Library -** Copyright (c) 2001 The OSSP Project (http://www.ossp.org/) -** Copyright (c) 2001 Cable & Wireless Deutschland (http://www.cw.com/de/) -** -** This file is part of OSSP L2, a flexible logging library which -** can be found at http://www.ossp.org/pkg/l2/. -** -** Permission to use, copy, modify, and distribute this software for -** any purpose with or without fee is hereby granted, provided that -** the above copyright notice and this permission notice appear in all -** copies. -** -** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -** 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 OF -** SUCH DAMAGE. -** -** l2++.cc: C++ API -*/ - -#include "l2++.h" -#include "l2.h" -#include "l2_p.h" - Index: ossp-pkg/l2/l2++.h RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2++.h,v co -q -kk -p'1.2' '/v/ossp/cvs/ossp-pkg/l2/Attic/l2++.h,v' | diff -u - /dev/null -L'ossp-pkg/l2/l2++.h' 2>/dev/null --- ossp-pkg/l2/l2++.h +++ /dev/null 2024-04-27 03:44:01.000000000 +0200 @@ -1,34 +0,0 @@ -/* -** L2 - OSSP Logging Library -** Copyright (c) 2001 The OSSP Project (http://www.ossp.org/) -** Copyright (c) 2001 Cable & Wireless Deutschland (http://www.cw.com/de/) -** -** This file is part of OSSP L2, a flexible logging library which -** can be found at http://www.ossp.org/pkg/l2/. -** -** Permission to use, copy, modify, and distribute this software for -** any purpose with or without fee is hereby granted, provided that -** the above copyright notice and this permission notice appear in all -** copies. -** -** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -** 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 OF -** SUCH DAMAGE. -** -** l2++.h: public C++ API -*/ - -#ifndef __L2PP_H__ -#define __L2PP_H__ - -#endif /* __L2PP_H__ */ - Index: ossp-pkg/l2/l2++.pod RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2++.pod,v co -q -kk -p'1.2' '/v/ossp/cvs/ossp-pkg/l2/Attic/l2++.pod,v' | diff -u - /dev/null -L'ossp-pkg/l2/l2++.pod' 2>/dev/null --- ossp-pkg/l2/l2++.pod +++ /dev/null 2024-04-27 03:44:01.000000000 +0200 @@ -1,53 +0,0 @@ -## -## L2 - OSSP Logging Library -## Copyright (c) 2001 The OSSP Project (http://www.ossp.org/) -## Copyright (c) 2001 Cable & Wireless Deutschland (http://www.cw.com/de/) -## -## This file is part of OSSP L2, a flexible logging library which -## can be found at http://www.ossp.org/pkg/l2/. -## -## Permission to use, copy, modify, and distribute this software for -## any purpose with or without fee is hereby granted, provided that -## the above copyright notice and this permission notice appear in all -## copies. -## -## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -## 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 OF -## SUCH DAMAGE. -## -## l2++.pod: Unix manual page for C++ API -## - -=pod - -=head1 NAME - -B - Logging Library (C++ API) - -=head1 VERSION - -L2 L2_VERSION_STR - -=head1 SYNOPSIS - -... - -=head1 DESCRIPTION - -The B library is... - -=head1 FUNCTIONS - -The following functions are provided by the B API: - -=cut - Index: ossp-pkg/l2/l2-config.in RCS File: /v/ossp/cvs/ossp-pkg/l2/l2-config.in,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/l2/l2-config.in,v' 2>/dev/null --- l2-config.in 2001/08/15 10:36:03 1.3 +++ l2-config.in 2001/12/22 21:51:56 1.4 @@ -53,7 +53,7 @@ usage="l2-config" usage="$usage [--help] [--version] [--all]" usage="$usage [--prefix] [--exec-prefix] [--bindir] [--libdir] [--includedir] [--mandir] [--datadir] [--acdir]" -usage="$usage [--cflags] [--ldflags] [--libs] [--libs++]" +usage="$usage [--cflags] [--ldflags] [--libs]" if [ $# -eq 0 ]; then echo "l2-config:Error: Invalid option" 1>&2 echo "l2-config:Usage: $usage" 1>&2 @@ -123,10 +123,6 @@ output="$output -ll2" output_extra="$output_extra $l2_libs" ;; - --libs++) - output="$output -ll2++" - output_extra="$output_extra $l2_libs" - ;; * ) echo "l2-config:Error: Invalid option" 1>&2 echo "l2-config:Usage: $usage" 1>&2 Index: ossp-pkg/l2/l2-config.pod RCS File: /v/ossp/cvs/ossp-pkg/l2/l2-config.pod,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/l2/l2-config.pod,v' 2>/dev/null --- l2-config.pod 2001/08/15 10:36:03 1.3 +++ l2-config.pod 2001/12/22 21:51:56 1.4 @@ -54,7 +54,6 @@ [B<--cflags>] [B<--ldflags>] [B<--libs>] -[B<--libs++>] =head1 DESCRIPTION @@ -132,12 +131,6 @@ the C l2(3) library. The output is usually added to the C variable of the applications C. -=item B<--libs++> - -Prints the library flags (C<-l>) which are needed to link the -application with the C++ l2(3) library. The output is usually added to -the C variable of the applications C. - =back =head1 EXAMPLE Index: ossp-pkg/l2/l2_test++.cc RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2_test++.cc,v co -q -kk -p'1.3' '/v/ossp/cvs/ossp-pkg/l2/Attic/l2_test++.cc,v' | diff -u - /dev/null -L'ossp-pkg/l2/l2_test++.cc' 2>/dev/null --- ossp-pkg/l2/l2_test++.cc +++ /dev/null 2024-04-27 03:44:01.000000000 +0200 @@ -1,36 +0,0 @@ -/* -** L2 - OSSP Logging Library -** Copyright (c) 2001 The OSSP Project (http://www.ossp.org/) -** Copyright (c) 2001 Cable & Wireless Deutschland (http://www.cw.com/de/) -** -** This file is part of OSSP L2, a flexible logging library which -** can be found at http://www.ossp.org/pkg/l2/. -** -** Permission to use, copy, modify, and distribute this software for -** any purpose with or without fee is hereby granted, provided that -** the above copyright notice and this permission notice appear in all -** copies. -** -** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -** 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 OF -** SUCH DAMAGE. -** -** l2_test++.cc: C++ API test suite -*/ - -#include "l2++.h" - -int main(int argc, char *argv[]) -{ - return 0; -} -