summaryrefslogtreecommitdiff
path: root/devel/pwlib
diff options
context:
space:
mode:
authorjlam <jlam>2002-02-08 06:29:42 +0000
committerjlam <jlam>2002-02-08 06:29:42 +0000
commit0294f803175a3899d8a58a8d723ec3e7f50ec7bc (patch)
tree72b3075153f82a319f9fe623efdfdea8dfeb5e1b /devel/pwlib
parent24fffc609bacb28832cb2e3a9153d0391216e6ae (diff)
downloadpkgsrc-0294f803175a3899d8a58a8d723ec3e7f50ec7bc.tar.gz
* Strongly buildlink'ify.
* Patch the grammer file getdate.y to be usable by (recent?) bison. * Use pthreads.buildlink.mk (native pthreads probably won't work, but we'll let it break until the time comes when we actually do have native threads).
Diffstat (limited to 'devel/pwlib')
-rw-r--r--devel/pwlib/Makefile94
-rw-r--r--devel/pwlib/distinfo10
-rw-r--r--devel/pwlib/patches/patch-aa174
-rw-r--r--devel/pwlib/patches/patch-ab50
-rw-r--r--devel/pwlib/patches/patch-ac29
-rw-r--r--devel/pwlib/patches/patch-ai21
-rw-r--r--devel/pwlib/patches/patch-aj32
7 files changed, 206 insertions, 204 deletions
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 25cfb3f8bad..a5b7662099b 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,46 +1,54 @@
-# $NetBSD: Makefile,v 1.11 2002/02/06 16:58:13 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/02/08 06:29:42 jlam Exp $
#
-DISTNAME= pwlib_min_1.1pl17
-PKGNAME= pwlib-1.1pl17
-CATEGORIES= devel
-MASTER_SITES= http://www.openh323.org/bin/ \
- http://www.au.openh323.org/bin/ \
- http://www.au2.openh323.org/bin/ \
- http://www.us1.openh323.org/bin/ \
- http://www.us2.openh323.org/bin/ \
- http://www.ru.openh323.org/bin/ \
- http://www.de.openh323.org/bin/ \
- http://www.at.openh323.org/bin/ \
- http://www.cz.openh323.org/bin/ \
- http://www.pl.openh323.org/bin/
-
-MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://www.openh323.org/
-COMMENT= Portable Windows Libary
-
-BUILD_DEPENDS= bison-[0-9]*:../../devel/bison
-DEPENDS+= unproven-pthreads>=0.17:../../devel/unproven-pthreads
-
-WRKSRC= ${WRKDIR}/pwlib
-
-USE_GMAKE= yes
-USE_LIBTOOL= yes
-
-pre-build:
- -cd ${WRKSRC}; ${LN} -f -s .. share
-
-do-build:
- cd ${WRKSRC}; env PWLIBDIR=`pwd` ${GMAKE} opt
-
-do-install:
- cd ${WRKSRC}; env PWLIBDIR=`pwd` ${GMAKE} install;
- ${INSTALL_DATA_DIR} ${PREFIX}/include/ptclib ${PREFIX}/include/ptlib/unix/ptlib
- cd ${WRKSRC}/include; \
- for f in `find . -name CVS -prune -o -type f ! -name "*.orig" -print` ; \
- do ${INSTALL_DATA} $$f ${PREFIX}/include/`dirname $$f`; done
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pwlib/make
- cd ${WRKSRC}/make; for f in unix.mak common.mak lib.mak ptlib.mak ; \
- do ${INSTALL_DATA} $$f ${PREFIX}/share/pwlib/make; done
-
+DISTNAME= pwlib_min_1.1pl17
+PKGNAME= pwlib-1.1pl17
+CATEGORIES= devel
+MASTER_SITES= http://www.openh323.org/bin/
+COUNTRY_MIRRORS= au au2 us1 us2 ru de at cz pl
+.for COUNTRY in ${COUNTRY_MIRRORS}
+MASTER_SITES+= ftp://www.${COUNTRY}.openh323.org/bin/
+.endfor
+
+MAINTAINER= packages@netbsd.org
+HOMEPAGE= http://www.openh323.org/
+COMMENT= Portable Windows Libary
+
+BUILD_DEPENDS= bison-[0-9]*:../../devel/bison
+
+WRKSRC= ${WRKDIR}/pwlib
+
+USE_BUILDLINK_ONLY= yes
+USE_GMAKE= yes
+USE_LIBTOOL= yes
+USE_PTHREAD= native unproven-pthreads
+
+.include "../../mk/bsd.prefs.mk"
+
+MAKE_ENV+= PWLIBDIR=${WRKSRC}
+MAKE_ENV+= CC="${CC}"
+MAKE_ENV+= CPLUS="${CXX}"
+ALL_TARGET= opt
+
+do-configure:
+ ${LN} -sf ${WRKDIR} ${WRKSRC}/share
+
+pre-install:
+ ${FIND} ${WRKSRC} \( -name CVS -o -name "*.orig" \) -print | \
+ ${XARGS} ${RM} -rf
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/ptclib
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/ptlib/unix/ptlib
+ cd ${WRKSRC}/include; \
+ for f in `${FIND} . -type f -print`; do \
+ ${INSTALL_DATA} $$f ${PREFIX}/include/`${DIRNAME} $$f`; \
+ done
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/pwlib/make
+ cd ${WRKSRC}/make; \
+ for f in unix.mak common.mak lib.mak ptlib.mak; do \
+ ${INSTALL_DATA} $$f ${PREFIX}/share/pwlib/make; \
+ done
+
+.include "../../mk/pthread.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index 983406623eb..ec0f626cb90 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:43 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/02/08 06:29:42 jlam Exp $
SHA1 (pwlib_min_1.1pl17.tar.gz) = 85008dde337b9d03b24e9441dcbc19906b1bb163
Size (pwlib_min_1.1pl17.tar.gz) = 606093 bytes
-SHA1 (patch-aa) = dff2b41d6ad6f2c7c009c3d5739c57f72f2345c5
-SHA1 (patch-ab) = f861afd35b4cbac46e8b7deba17f3ffd27160a1c
-SHA1 (patch-ac) = b217fd258e8012313765094a1ddaaae06441cdee
+SHA1 (patch-aa) = 7ee7cb8840f979150818ce143607a08a8f8b81b9
+SHA1 (patch-ab) = 7e458854415708c7c35c9039d68f74d84b2107c9
+SHA1 (patch-ac) = 376d32495c2b1bf711680aa967403099c7db3e94
SHA1 (patch-ad) = 1b59a8281c465b82334e1454bd7861402d590ae6
SHA1 (patch-ae) = b2b7f21bdef6a05d17da564bc99c3c6bdf3b949f
SHA1 (patch-af) = a2ddeef36b1f7d280a39270902b45ae5fb6bebf1
SHA1 (patch-ag) = 1607f6e50c73ca0cd017c93b87ad97ef8873a492
SHA1 (patch-ah) = 9119804a6229a50a0cecdc5d2c5c5ae0aa3c29d6
+SHA1 (patch-ai) = 029e5f77e17f080c06545c9c14b5f65a9aca2e03
+SHA1 (patch-aj) = 263f1479719e8b216a36796cd06fbf267235527d
diff --git a/devel/pwlib/patches/patch-aa b/devel/pwlib/patches/patch-aa
index c1b7be31711..76d5e63e684 100644
--- a/devel/pwlib/patches/patch-aa
+++ b/devel/pwlib/patches/patch-aa
@@ -1,123 +1,53 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/25 16:03:42 mjl Exp $
+$NetBSD: patch-aa,v 1.2 2002/02/08 06:29:43 jlam Exp $
-*** make/unix.mak.orig Mon Jun 26 13:17:20 2000
---- make/unix.mak Thu Aug 24 23:01:20 2000
-***************
-*** 494,506 ****
- STDCCFLAGS += -m486
- endif
-
- STDCCFLAGS += -DP_NETBSD
- LDLIBS += -lossaudio
-
- ifdef P_PTHREADS
- STDCCFLAGS += -I/usr/pkg/pthreads/include
-! LDFLAGS += -L/usr/pkg/pthreads/lib
-! LDLIBS += -lpthread
- CC := /usr/pkg/pthreads/bin/pgcc
- CPLUS := /usr/pkg/pthreads/bin/pg++
- endif
---- 494,508 ----
- STDCCFLAGS += -m486
- endif
-
-+ P_SHAREDLIB=1
-+
- STDCCFLAGS += -DP_NETBSD
- LDLIBS += -lossaudio
-
- ifdef P_PTHREADS
- STDCCFLAGS += -I/usr/pkg/pthreads/include
-! LDFLAGS +=
-! LDLIBS += /usr/pkg/pthreads/lib/libpthread.so
- CC := /usr/pkg/pthreads/bin/pgcc
- CPLUS := /usr/pkg/pthreads/bin/pg++
- endif
-***************
-*** 667,673 ****
- endif
-
- ifndef INSTALL
-! INSTALL := install
- endif
-
- ifndef AR
---- 669,675 ----
- endif
-
- ifndef INSTALL
-! INSTALL := ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
- endif
-
- ifndef AR
-***************
-*** 708,714 ****
- ifeq ($(P_SHAREDLIB),0)
- LIB_SUFFIX = a
- else
-! LIB_SUFFIX = so
- endif
-
- ifndef LIB_TYPE
---- 710,716 ----
- ifeq ($(P_SHAREDLIB),0)
- LIB_SUFFIX = a
- else
-! LIB_SUFFIX = la
- endif
-
- ifndef LIB_TYPE
-***************
-*** 716,722 ****
- endif
-
- ifndef INSTALL_DIR
-! INSTALL_DIR = /usr/local
- endif
-
- ifndef INSTALLBIN_DIR
---- 718,724 ----
- endif
-
- ifndef INSTALL_DIR
-! INSTALL_DIR = ${PREFIX}
- endif
-
- ifndef INSTALLBIN_DIR
-***************
-*** 785,791 ****
- PW_LIBDIR = $(PWLIBDIR)/lib
-
- # set name of the PT library
-! PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
- PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
- PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
- PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE)
---- 787,794 ----
- PW_LIBDIR = $(PWLIBDIR)/lib
-
- # set name of the PT library
-! # PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-! PTLIB_BASE = pt
- PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
- PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
- PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE)
-***************
-*** 849,856 ****
-
-
- # add library directory to library path and include the library
-! LDFLAGS += -L$(PW_LIBDIR)
-
-! LDLIBS += -l$(PTLIB_BASE)$(LIB_TYPE)
-
- # End of unix.mak
---- 852,859 ----
-
-
- # add library directory to library path and include the library
-! LDFLAGS +=
-
-! LDLIBS += ../../lib/lib$(PTLIB_BASE)$(LIB_TYPE).la
-
- # End of unix.mak
+--- make/unix.mak.orig Mon Jun 26 07:17:20 2000
++++ make/unix.mak
+@@ -497,14 +497,7 @@
+ STDCCFLAGS += -DP_NETBSD
+ LDLIBS += -lossaudio
+
+-ifdef P_PTHREADS
+-STDCCFLAGS += -I/usr/pkg/pthreads/include
+-LDFLAGS += -L/usr/pkg/pthreads/lib
+-LDLIBS += -lpthread
+-CC := /usr/pkg/pthreads/bin/pgcc
+-CPLUS := /usr/pkg/pthreads/bin/pg++
+-endif
+-
++P_SHAREDLIB := 1
+ P_USE_RANLIB := 1
+
+ endif # NetBSD
+@@ -708,13 +701,14 @@
+ ifeq ($(P_SHAREDLIB),0)
+ LIB_SUFFIX = a
+ else
+-LIB_SUFFIX = so
++LIB_SUFFIX = la
+ endif
+
+ ifndef LIB_TYPE
+ LIB_TYPE =
+ endif
+
++INSTALL_DIR = ${PREFIX}
+ ifndef INSTALL_DIR
+ INSTALL_DIR = /usr/local
+ endif
+@@ -785,7 +779,7 @@
+ PW_LIBDIR = $(PWLIBDIR)/lib
+
+ # set name of the PT library
+-PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
++PTLIB_BASE = pt
+ PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
+ PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
+ PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE)
+@@ -851,6 +845,6 @@
+ # add library directory to library path and include the library
+ LDFLAGS += -L$(PW_LIBDIR)
+
+-LDLIBS += -l$(PTLIB_BASE)$(LIB_TYPE)
++LDLIBS += $(PW_LIBDIR)/$(PTLIB_FILE)
+
+ # End of unix.mak
diff --git a/devel/pwlib/patches/patch-ab b/devel/pwlib/patches/patch-ab
index 0dc6ca24d30..5ea7ff785e1 100644
--- a/devel/pwlib/patches/patch-ab
+++ b/devel/pwlib/patches/patch-ab
@@ -1,18 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2001/03/05 12:40:25 skrll Exp $
+$NetBSD: patch-ab,v 1.3 2002/02/08 06:29:43 jlam Exp $
---- make/lib.mak.orig Fri May 19 02:26:31 2000
+--- make/lib.mak.orig Thu May 18 21:26:31 2000
+++ make/lib.mak
-@@ -49,29 +49,33 @@
- BUILD_NUMBER := 0
- endif
-
-+ifndef PROG
-+CC := ${LIBTOOL} --mode=compile --tag=CC /usr/pkg/pthreads/bin/pgcc
-+CPLUS := ${LIBTOOL} --mode=compile --tag=CXX /usr/pkg/pthreads/bin/pg++
-+INSTALL := ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
-+endif
-+
- LIBNAME_MAJ = $(LIB_BASENAME).$(MAJOR_VERSION)
+@@ -53,36 +53,18 @@
LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION)
LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER)$(BUILD_TYPE)
@@ -23,20 +13,14 @@ $NetBSD: patch-ab,v 1.2 2001/03/05 12:40:25 skrll Exp $
- ln -s $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIBNAME_MAJ)
- @rm -f $(LIBDIR)/$(LIBNAME_MIN)
- ln -s $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIBNAME_MIN)
-+# $(LIBDIR)/$(LIB_BASENAME): $(LIBDIR)/$(LIBNAME_PAT)
-+ # @rm -f $(LIBDIR)/$(LIB_BASENAME)
-+ # ln -s $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_BASENAME)
-+ # @rm -f $(LIBDIR)/$(LIBNAME_MAJ)
-+ # ln -s $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIBNAME_MAJ)
-+ # @rm -f $(LIBDIR)/$(LIBNAME_MIN)
-+ # ln -s $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIBNAME_MIN)
-
+-
-$(LIBDIR)/$(LIBNAME_PAT): $(OBJS)
-+$(LIBDIR)/${LIB_BASENAME}: $(OBJS)
++$(LIBDIR)/$(LIB_BASENAME): $(OBJS)
@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
- gcc -shared -Wl,-soname,$(LIB_BASENAME).1 -o $(LIBDIR)/$(LIBNAME_PAT) $(OBJS)
-+ ${LIBTOOL} --mode=link --tag=CXX g++ -o ${LIBDIR}/${LIB_BASENAME:.so=.la} ${OBJS:.o=.lo} \
-+ -rpath ${PREFIX}/lib -version-info ${MAJOR_VERSION}:${MINOR_VERSION}
++ $(LIBTOOL) --tag=CXX $(CPLUS) -o $(LIBDIR)/$(LIB_BASENAME) \
++ $(OBJS:.o=.lo) -rpath $(INSTALLLIB_DIR) \
++ -version-info $(MAJOR_VERSION):$(MINOR_VERSION)
CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_BASENAME) $(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN)
@@ -45,17 +29,19 @@ $NetBSD: patch-ab,v 1.2 2001/03/05 12:40:25 skrll Exp $
- ln -s $(INSTALLLIB_DIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_BASENAME)
- ln -s $(INSTALLLIB_DIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
- ln -s $(INSTALLLIB_DIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
+-
+-else
+install: $(LIBDIR)/$(LIB_BASENAME)
-+ $(INSTALL) $(LIBDIR)/$(LIB_BASENAME) $(INSTALLLIB_DIR)
++ $(LIBTOOL) $(BSD_INSTALL_DATA) $(LIBDIR)/$(LIB_BASENAME) $(INSTALLLIB_DIR)
- else
-
-@@ -81,7 +85,7 @@
- $(AR) rc $(LIBDIR)/$(LIB_BASENAME) $(OBJS)
- $(RANLIB) $(LIBDIR)/$(LIB_BASENAME)
+-$(LIBDIR)/$(LIB_BASENAME): $(OBJS)
+- @if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
+-ifdef P_USE_RANLIB
+- $(AR) rc $(LIBDIR)/$(LIB_BASENAME) $(OBJS)
+- $(RANLIB) $(LIBDIR)/$(LIB_BASENAME)
else
- $(AR) rcs $(LIBDIR)/$(LIB_BASENAME) $(OBJS)
-+ # $(AR) rcs $(LIBDIR)/$(LIB_BASENAME) $(OBJS)
- endif
+-endif
CLEAN_FILES += $(LIBDIR)/$(LIB_BASENAME)
+
diff --git a/devel/pwlib/patches/patch-ac b/devel/pwlib/patches/patch-ac
index 33563ea2f17..b743f1efb3a 100644
--- a/devel/pwlib/patches/patch-ac
+++ b/devel/pwlib/patches/patch-ac
@@ -1,13 +1,36 @@
-$NetBSD: patch-ac,v 1.2 2001/03/05 12:40:26 skrll Exp $
+$NetBSD: patch-ac,v 1.3 2002/02/08 06:29:44 jlam Exp $
---- make/common.mak.orig Wed Apr 26 01:40:48 2000
+--- make/common.mak.orig Tue Apr 25 20:40:48 2000
+++ make/common.mak
+@@ -148,11 +148,11 @@
+ #
+ $(OBJDIR)/%.o : %.cxx
+ @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
+- $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
++ $(LIBTOOL) --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+
+ $(OBJDIR)/%.o : %.c
+ @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
+- $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
++ $(LIBTOOL) --tag=CC $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+
+ #
+ # create list of object files
@@ -213,7 +213,7 @@
endif
$(TARGET): $(OBJS) $(TARGET_LIBS)
- $(CPLUS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS)
-+ ${LIBTOOL} --mode=link --tag=CXX $(CPLUS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS)
++ $(LIBTOOL) --tag=CXX $(CPLUS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS)
ifdef DEBUG
+@@ -238,7 +238,7 @@
+ ifndef INSTALL_OVERRIDE
+
+ install: $(TARGET)
+- $(INSTALL) $(TARGET) $(INSTALLBIN_DIR)
++ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALLBIN_DIR)
+ endif
+
+ # ifdef PROG
diff --git a/devel/pwlib/patches/patch-ai b/devel/pwlib/patches/patch-ai
new file mode 100644
index 00000000000..cb8cad143c0
--- /dev/null
+++ b/devel/pwlib/patches/patch-ai
@@ -0,0 +1,21 @@
+$NetBSD: patch-ai,v 1.1 2002/02/08 06:29:44 jlam Exp $
+
+--- src/ptlib/common/getdate.y.orig Sun Jul 11 22:37:23 1999
++++ src/ptlib/common/getdate.y
+@@ -18,6 +18,7 @@
+ /* SUPPRESS 288 on yyerrlab *//* Label unused */
+
+
++#include <stdio.h>
+ #include <time.h>
+ #include <string.h>
+ #include <ctype.h>
+@@ -99,7 +100,7 @@
+ #define VARIABLE ((struct Variables*)parseParam)
+
+
+-#define YYPURE
++#define YYPURE 0
+ #define YYLEX_PARAM VARIABLE->yyInput
+ #define YYPARSE_PARAM parseParam
+
diff --git a/devel/pwlib/patches/patch-aj b/devel/pwlib/patches/patch-aj
new file mode 100644
index 00000000000..725a01b7ff7
--- /dev/null
+++ b/devel/pwlib/patches/patch-aj
@@ -0,0 +1,32 @@
+$NetBSD: patch-aj,v 1.1 2002/02/08 06:29:44 jlam Exp $
+
+--- src/ptlib/unix/Makefile.orig Fri Feb 8 00:37:01 2002
++++ src/ptlib/unix/Makefile
+@@ -340,23 +340,23 @@
+ ifdef REQUIRES_SEPARATE_SWITCH
+ $(OBJDIR)/switch.o: ./switch.cxx
+ @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
+- $(CPLUS) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
++ $(LIBTOOL) --tag=CXX $(CPLUS) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
+ endif
+
+ CLEAN_FILES := $(CLEAN_FILES) $(LIBDIR)/$(PTLIB_FILE) $(GETDATE_SOURCE)
+
+ $(OBJDIR)/regex.o: ../../../src/ptlib/common/regex.cxx
+- $(CPLUS) -DREGEX_MALLOC -D__STDC__ -DSTDC_HEADERS $(CFLAGS) $(STDCCFLAGS) -c -w $< -o $@
++ $(LIBTOOL) --tag=CXX $(CPLUS) -DREGEX_MALLOC -D__STDC__ -DSTDC_HEADERS $(CFLAGS) $(STDCCFLAGS) -c -w $< -o $@
+
+ $(OBJDIR)/getdate.tab.o: $(GETDATE_SOURCE)
+- $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
++ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
+
+ $(DEPDIR)/getdate.tab.dep: $(GETDATE_SOURCE)
+ $(CC) $(STDCCFLAGS) -M $< >> $@
+
+ ifeq ($(OSTYPE),beos)
+ $(OBJDIR)/resample.o: $(BEAUDIO_SRC_DIR)/resample.c
+- $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
++ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@
+ endif
+
+ $(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y