$NetBSD: patch-ai,v 1.7 2006/01/08 04:57:55 joerg Exp $

--- make/common.mak.orig	2004-06-10 03:36:44.000000000 +0200
+++ make/common.mak	2004-10-09 12:52:56.000000000 +0200
@@ -310,11 +310,11 @@
 #
 $(OBJDIR)/%.o : %.cxx 
 	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
-	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
+	@LIBTOOL@ --mode=compile --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
 
 $(OBJDIR)/%.o : %.c 
 	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
-	$(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c -c $< -o $@
+	@LIBTOOL@ --mode=compile --tag=CC $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c -c $< -o $@
 
 #
 # create list of object files 
@@ -379,7 +379,7 @@
 # directory
 	@if [ ! -L $(OBJDIR)/lib ] ; then cd $(OBJDIR); ln -s $(PW_LIBDIR) lib; fi
 endif
-	$(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
+	@LIBTOOL@ --mode=link --tag=CXX $(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
 ifeq ($(OSTYPE),VxWorks)
 	$(LD)   --split-by-reloc 65535 -r   $(OBJS) -o $@ 
 endif
@@ -405,7 +405,7 @@
 ifndef INSTALL_OVERRIDE
 
 install:	$(TARGET)
-	$(INSTALL) $(TARGET) $(INSTALLBIN_DIR)
+	@LIBTOOL@ --mode=install @BSD_INSTALL_PROGRAM@ $(TARGET) $(INSTALLBIN_DIR)
 endif
 
 # ifdef PROG
@@ -413,7 +413,7 @@
 
 $(PWLIBDIR)/include/ptlib.h.gch: $(PWLIBDIR)/include/ptlib.h
 	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
-	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
+	@LIBTOOL@ --mode=compile --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
 
 PCH	:= $(PWLIBDIR)/include/ptlib.h.gch
 
@@ -481,7 +481,7 @@
 	@$(MAKE) DEBUG= libs
 
 libs ::
-	set -e; for i in $(LIBDIRS); do $(MAKE) -C $$i debugdepend debug; done
+	# set -e; for i in $(LIBDIRS); do $(MAKE) -C $$i debugdepend debug; done
 
 else
 
@@ -510,7 +510,7 @@
 optlibs :: libs
 
 libs ::
-	set -e; for i in $(LIBDIRS); do $(MAKE) -C $$i optdepend opt; done
+	# set -e; for i in $(LIBDIRS); do $(MAKE) -C $$i optdepend opt; done
 
 endif