|
Check-in Number:
|
1445 | |
| Date: |
2001-Dec-22 22:51:56 (local)
2001-Dec-22 21:51:56 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
Remove all half-done C++ things. Because in the near future we neither
will have time to finish this nor do we really want it to be finished.
So kick out all of this stuff. If we later want to add real C++ support,
we can easily apply this again. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/l2/Makefile.in 1.37 -> 1.38
--- 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
|
|
ossp-pkg/l2/aclocal.m4 1.8 -> 1.9
--- 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)
|
|
ossp-pkg/l2/configure.ac 1.15 -> 1.16
--- 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
|
|
ossp-pkg/l2/l2++.cc 1.2 -> 1.3
ossp-pkg/l2/l2++.h 1.2 -> 1.3
ossp-pkg/l2/l2++.pod 1.2 -> 1.3
ossp-pkg/l2/l2-config.in 1.3 -> 1.4
--- 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
|
|
ossp-pkg/l2/l2-config.pod 1.3 -> 1.4
--- 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<LIBS> variable of the
applications C<Makefile>.
-=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<LIBS> variable of the applications C<Makefile>.
-
=back
=head1 EXAMPLE
|
|
ossp-pkg/l2/l2_test++.cc 1.3 -> 1.4
