OSSP CVS Repository

ossp - Difference in ossp-pkg/l2/Makefile.in versions 1.37 and 1.38
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

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
 

CVSTrac 2.0.1