jhbuild r2383 - in trunk: . modulesets patches

From: fpeters svn gnome org
To: svn-commits-list gnome org
Subject: jhbuild r2383 - in trunk: . modulesets patches
Date: Wed, 24 Sep 2008 10:39:19 +0000 (UTC)
Author: fpeters
Date: Wed Sep 24 10:39:19 2008
New Revision: 2383
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2383&view=rev

Log:
* modulesets/gnome-external-deps-2.24.modules,
patches/opal-3.4.0-add-missing-file.patch,
patches/opal-3.4.0-remove-makefile.patch,
patches/opal-3.4.1-remove-makefile.patch,
patches/ptlib-2.4.0-remove-makefile.patch,
patches/ptlib-2.4.1-remove-makefile.patch: updated ptlib to 2.4.1 and



Added:
   trunk/patches/opal-3.4.1-remove-makefile.patch
   trunk/patches/ptlib-2.4.1-remove-makefile.patch
Removed:
   trunk/patches/opal-3.4.0-add-missing-file.patch
   trunk/patches/opal-3.4.0-remove-makefile.patch
   trunk/patches/ptlib-2.4.0-remove-makefile.patch
Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-external-deps-2.24.modules

Modified: trunk/modulesets/gnome-external-deps-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.24.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.24.modules	Wed Sep 24 10:39:19 2008
@@ -284,11 +284,10 @@
 
   <autotools id="opal" autogenargs="--disable-vpb"
 	  check-target="false">
-    <branch module="opalvoip/opal-3.4.0-src.tar.bz2" repo="sourceforge.net"
-	    version="3.4.0" checkoutdir="opal_3.4.0"
-            md5sum="0c937919c698630f72ab4e3e0bb27fc0" size="8276609">
-      <patch file="opal-3.4.0-remove-makefile.patch" strip="1"/>
-      <patch file="opal-3.4.0-add-missing-file.patch" strip="1"/>
+    <branch module="opal/3.4/opal-3.4.1.tar.bz2" repo="gnome.org"
+	    version="3.4.1"
+            md5sum="f600066f362ba61e00375bf327f28458" size="15629492">
+      <patch file="opal-3.4.1-remove-makefile.patch" strip="1"/>
     </branch>
     <dependencies>
       <dep package="ptlib"/>
@@ -335,11 +334,11 @@
   </autotools>
 
   <autotools id="ptlib" check-target="false">
-    <branch module="opalvoip/ptlib-2.4.0-src.tar.bz2" repo="sourceforge.net"
+    <branch module="ptlib/2.4/ptlib-2.4.1.tar.bz2" repo="gnome.org"
             autogen-sh="configure"
-            version="2.4.0" checkoutdir="ptlib_2.4.0"
-            md5sum="95412075c331e79d27639b0bf5c95177" size="5123136">
-      <patch file="ptlib-2.4.0-remove-makefile.patch" strip="1"/>
+            version="2.4.1"
+            md5sum="79d6431a30ec7a558633e67c25e689f9" size="5085930">
+      <patch file="ptlib-2.4.1-remove-makefile.patch" strip="1"/>
     </branch>
   </autotools>
 

Added: trunk/patches/opal-3.4.1-remove-makefile.patch
==============================================================================
--- (empty file)
+++ trunk/patches/opal-3.4.1-remove-makefile.patch	Wed Sep 24 10:39:19 2008
@@ -0,0 +1,607 @@
+diff -Naur opal-3.4.1.orig/Makefile opal-3.4.1/Makefile
+--- opal-3.4.1.orig/Makefile	2008-09-22 14:23:59.000000000 +0200
++++ opal-3.4.1/Makefile	1970-01-01 01:00:00.000000000 +0100
+@@ -1,603 +0,0 @@
+-#
+-# Makefile
+-#
+-# Make file for Open Phone Abstraction library
+-#
+-# Copyright (c) 2001 Equivalence Pty. Ltd.
+-#
+-# The contents of this file are subject to the Mozilla Public License
+-# Version 1.0 (the "License"); you may not use this file except in
+-# compliance with the License. You may obtain a copy of the License at
+-# http://www.mozilla.org/MPL/
+-#
+-# Software distributed under the License is distributed on an "AS IS"
+-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+-# the License for the specific language governing rights and limitations
+-# under the License.
+-#
+-# The Original Code is Open Phone Abstraction Library.
+-#
+-# The Initial Developer of the Original Code is Equivalence Pty. Ltd.
+-#
+-# Contributor(s): ______________________________________.
+-#
+-# $Revision: 21024 $
+-# $Author: ms30002000 $
+-# $Date: 2008-09-16 19:57:13 +0000 (Tue, 16 Sep 2008) $
+-#
+-
+-include opal_defs.mak
+-
+-SHELL		:= /bin/sh
+-OS_NAME=$(shell uname -s)
+-ifeq ($(OS_NAME),SunOS)
+-  override SHELL=/usr/bin/bash
+-endif
+-
+-SUBDIRS := 
+-
+-ifeq ($(OPAL_PLUGINS),yes)
+-SUBDIRS += plugins 
+-endif
+-
+-ifeq ($(OPAL_SAMPLES),yes)
+-SUBDIRS += samples/simple samples/opalcodecinfo samples/callgen samples/c_api
+-endif
+-
+-
+-ifeq ($(DEBUG_BUILD),yes)
+-  LIB_FILENAME_STATIC=$(DEBUG_LIB_FILENAME_STATIC)
+-  LIB_FILENAME_SHARED=$(DEBUG_LIB_FILENAME_SHARED)
+-  LIB_FILENAME_SHARED_MAJ=$(DEBUG_LIB_FILENAME_SHARED_MAJ)
+-  LIB_FILENAME_SHARED_MIN=$(DEBUG_LIB_FILENAME_SHARED_MIN)
+-  LIB_FILENAME_SHARED_PAT=$(DEBUG_LIB_FILENAME_SHARED_PAT)
+-  OPAL_OBJDIR=$(DEBUG_OPAL_OBJDIR)
+-  OPAL_DEPDIR=$(DEBUG_OPAL_DEPDIR)
+-else
+-  LIB_FILENAME_STATIC=$(RELEASE_LIB_FILENAME_STATIC)
+-  LIB_FILENAME_SHARED=$(RELEASE_LIB_FILENAME_SHARED)
+-  LIB_FILENAME_SHARED_MAJ=$(RELEASE_LIB_FILENAME_SHARED_MAJ)
+-  LIB_FILENAME_SHARED_MIN=$(RELEASE_LIB_FILENAME_SHARED_MIN)
+-  LIB_FILENAME_SHARED_PAT=$(RELEASE_LIB_FILENAME_SHARED_PAT)
+-  OPAL_OBJDIR=$(RELEASE_OPAL_OBJDIR)
+-  OPAL_DEPDIR=$(RELEASE_OPAL_DEPDIR)
+-endif
+-
+-
+-ASN_SRCDIR := $(OPAL_SRCDIR)/asn
+-ASN_INCDIR := $(OPAL_INCDIR)/asn
+-
+-VPATH_CXX := $(OPAL_SRCDIR)/opal \
+-	     $(OPAL_SRCDIR)/rtp \
+-	     $(OPAL_SRCDIR)/lids \
+-	     $(OPAL_SRCDIR)/codec \
+-             $(OPAL_SRCDIR)/t38
+-
+-ifneq (,$(wildcard src/iax2))
+-IAX2_AVAIL = yes
+-VPATH_CXX += $(OPAL_SRCDIR)/iax2 
+-endif
+-
+-ifneq (,$(wildcard src/zrtp))
+-ZRTP_AVAIL = yes
+-VPATH_CXX += $(OPAL_SRCDIR)/zrtp
+-endif
+-
+-ifneq (,$(wildcard src/sip))
+-SIP_AVAIL = yes
+-VPATH_CXX += $(OPAL_SRCDIR)/sip
+-endif
+-
+-ifneq (,$(wildcard src/h323))
+-H323_AVAIL = yes
+-VPATH_CXX += $(OPAL_SRCDIR)/h323 \
+-	     $(OPAL_SRCDIR)/t120 \
+-	     $(OPAL_SRCDIR)/asn 
+-endif
+-
+-ifneq (,$(wildcard src/h224))
+-H224_AVAIL = yes
+-VPATH_CXX += $(OPAL_SRCDIR)/h224
+-
+-endif
+-
+-ifneq (,$(wildcard src/h460))
+-H460_AVAIL = yes
+-VPATH_CXX += $(OPAL_SRCDIR)/h460
+-endif
+-
+-VPATH_C := $(OPAL_SRCDIR)/codec
+-
+-########################################
+-# Source files for library
+-
+-SOURCES := $(OPAL_SRCDIR)/opal/manager.cxx \
+-           $(OPAL_SRCDIR)/opal/endpoint.cxx \
+-           $(OPAL_SRCDIR)/opal/rtpep.cxx \
+-           $(OPAL_SRCDIR)/opal/connection.cxx \
+-           $(OPAL_SRCDIR)/opal/rtpconn.cxx \
+-           $(OPAL_SRCDIR)/opal/localep.cxx \
+-           $(OPAL_SRCDIR)/opal/call.cxx \
+-           $(OPAL_SRCDIR)/opal/mediafmt.cxx \
+-           $(OPAL_SRCDIR)/opal/mediatype.cxx \
+-           $(OPAL_SRCDIR)/opal/mediastrm.cxx \
+-           $(OPAL_SRCDIR)/opal/patch.cxx \
+-           $(OPAL_SRCDIR)/opal/transcoders.cxx \
+-           $(OPAL_SRCDIR)/opal/transports.cxx \
+-           $(OPAL_SRCDIR)/opal/guid.cxx \
+-           $(OPAL_SRCDIR)/opal/opalmixer.cxx \
+-	   $(OPAL_SRCDIR)/opal/opalglobalstatics.cxx \
+-           $(OPAL_SRCDIR)/rtp/rtp.cxx \
+-           $(OPAL_SRCDIR)/rtp/jitter.cxx \
+-	   $(OPAL_SRCDIR)/opal/opal_c.cxx \
+-	   $(OPAL_SRCDIR)/opal/pcss.cxx 
+-
+-ifeq ($(OPAL_IVR), yes)
+-SOURCES += $(OPAL_SRCDIR)/opal/ivr.cxx \
+-           $(OPAL_SRCDIR)/opal/opalvxml.cxx 
+-endif
+-
+-
+-########################################
+-
+-# H.323 files
+-
+-ifeq ($(OPAL_H323),yes)
+-ifdef H323_AVAIL
+-
+-H450_ASN_FILES := h4501 h4502 h4503 h4504 h4505 h4506 h4507 h4508 h4509 h45010 h45011
+-SIMPLE_ASN_FILES := x880 $(H450_ASN_FILES) mcs gcc
+-
+-ASN_H_FILES   := $(addprefix $(ASN_INCDIR)/,$(addsuffix .h,  $(SIMPLE_ASN_FILES)))
+-ASN_CXX_FILES := $(addprefix $(ASN_SRCDIR)/,$(addsuffix .cxx,$(SIMPLE_ASN_FILES)))
+-
+-ASN_H_FILES   += $(ASN_INCDIR)/h225.h
+-ASN_CXX_FILES += $(ASN_SRCDIR)/h225_1.cxx $(ASN_SRCDIR)/h225_2.cxx
+-
+-ASN_H_FILES   += $(ASN_INCDIR)/h235.h $(ASN_SRCDIR)/h235_t.cxx
+-ASN_CXX_FILES += $(ASN_SRCDIR)/h235.cxx
+-
+-ASN_H_FILES   += $(ASN_INCDIR)/h245.h
+-ASN_CXX_FILES += $(ASN_SRCDIR)/h245_1.cxx $(ASN_SRCDIR)/h245_2.cxx $(ASN_SRCDIR)/h245_3.cxx
+-
+-ASN_H_FILES   += $(ASN_INCDIR)/h248.h
+-ASN_CXX_FILES += $(ASN_SRCDIR)/h248.cxx
+-
+-ASN_H_FILES   += $(ASN_INCDIR)/h501.h
+-ASN_CXX_FILES += $(ASN_SRCDIR)/h501.cxx
+-
+-.PRECIOUS: $(ASN_CXX_FILES) $(ASN_H_FILES)
+-
+-
+-SOURCES += $(ASN_CXX_FILES) \
+-           $(OPAL_SRCDIR)/h323/h323ep.cxx \
+-           $(OPAL_SRCDIR)/h323/h323.cxx \
+-           $(OPAL_SRCDIR)/h323/h323caps.cxx \
+-           $(OPAL_SRCDIR)/h323/h323neg.cxx \
+-           $(OPAL_SRCDIR)/h323/h323pdu.cxx \
+-           $(OPAL_SRCDIR)/h323/h323rtp.cxx \
+-           $(OPAL_SRCDIR)/h323/channels.cxx \
+-           $(OPAL_SRCDIR)/h323/svcctrl.cxx \
+-           $(OPAL_SRCDIR)/h323/h450pdu.cxx \
+-           $(OPAL_SRCDIR)/h323/q931.cxx \
+-           $(OPAL_SRCDIR)/h323/transaddr.cxx \
+-           $(OPAL_SRCDIR)/h323/gkclient.cxx \
+-           $(OPAL_SRCDIR)/h323/gkserver.cxx \
+-           $(OPAL_SRCDIR)/h323/h225ras.cxx \
+-           $(OPAL_SRCDIR)/h323/h323trans.cxx \
+-           $(OPAL_SRCDIR)/h323/h235auth.cxx \
+-           $(OPAL_SRCDIR)/h323/h501pdu.cxx \
+-           $(OPAL_SRCDIR)/h323/h323annexg.cxx \
+-           $(OPAL_SRCDIR)/h323/peclient.cxx \
+-
+-ifeq ($(OPAL_H460), yes)
+-ifdef H460_AVAIL
+-SOURCES += $(OPAL_SRCDIR)/h460/h4601.cxx \
+-	   $(OPAL_SRCDIR)/h460/h46018.cxx \
+-	   $(OPAL_SRCDIR)/h460/h46019.cxx \
+-	   $(OPAL_SRCDIR)/h460/h4609.cxx \
+-	   $(OPAL_SRCDIR)/h460/h460p.cxx \
+-	   $(OPAL_SRCDIR)/h460/h460pres.cxx \
+-	   $(OPAL_SRCDIR)/h460/h460tm.cxx
+-endif
+-endif
+-
+-ifdef OPAL_PTLIB_SSL
+-SOURCES += $(OPAL_SRCDIR)/h235auth1.cxx
+-endif
+-
+-SOURCES += $(OPAL_SRCDIR)/t120/t120proto.cxx \
+-           $(OPAL_SRCDIR)/t120/h323t120.cxx \
+-           $(OPAL_SRCDIR)/t120/x224.cxx 
+-
+-ifeq ($(OPAL_T38_CAP), yes)
+-SOURCES += $(OPAL_SRCDIR)/t38/h323t38.cxx
+-endif
+-
+-ifeq ($(OPAL_H224FECC), yes)
+-ifdef H224_AVAIL
+-SOURCES += $(OPAL_SRCDIR)/h224/h323h224.cxx
+-endif
+-endif
+-
+-endif
+-endif
+-
+-##################
+-# IAX2 files
+-
+-ifeq ($(OPAL_IAX2), yes)
+-ifdef IAX2_AVAIL
+-
+-SOURCES += \
+-           $(OPAL_SRCDIR)/iax2/callprocessor.cxx \
+-           $(OPAL_SRCDIR)/iax2/frame.cxx \
+-           $(OPAL_SRCDIR)/iax2/iax2con.cxx \
+-           $(OPAL_SRCDIR)/iax2/iax2ep.cxx \
+-           $(OPAL_SRCDIR)/iax2/iax2jitter.cxx \
+-           $(OPAL_SRCDIR)/iax2/iax2medstrm.cxx \
+-           $(OPAL_SRCDIR)/iax2/iedata.cxx \
+-           $(OPAL_SRCDIR)/iax2/ies.cxx \
+-           $(OPAL_SRCDIR)/iax2/processor.cxx \
+-           $(OPAL_SRCDIR)/iax2/receiver.cxx \
+-           $(OPAL_SRCDIR)/iax2/regprocessor.cxx\
+-           $(OPAL_SRCDIR)/iax2/remote.cxx \
+-           $(OPAL_SRCDIR)/iax2/safestrings.cxx \
+-           $(OPAL_SRCDIR)/iax2/sound.cxx \
+-           $(OPAL_SRCDIR)/iax2/specialprocessor.cxx \
+-           $(OPAL_SRCDIR)/iax2/transmit.cxx 
+-endif
+-endif
+-
+-################################################################################
+-# ZRTP files
+-
+-ifeq ($(OPAL_ZRTP),yes)
+-ifdef ZRTP_AVAIL
+-
+-SOURCES += $(OPAL_SRCDIR)/zrtp/opalzrtp.cxx \
+-           $(OPAL_SRCDIR)/rtp/zrtpudp.cxx
+-
+-endif
+-endif
+-
+-
+-################################################################################
+-# SIP files
+-
+-ifeq ($(OPAL_SIP),yes)
+-ifdef SIP_AVAIL
+-
+-SOURCES += $(OPAL_SRCDIR)/sip/sipep.cxx \
+-           $(OPAL_SRCDIR)/sip/sipcon.cxx \
+-           $(OPAL_SRCDIR)/sip/sippdu.cxx \
+-           $(OPAL_SRCDIR)/sip/sdp.cxx \
+-           $(OPAL_SRCDIR)/sip/handlers.cxx \
+-
+-ifeq ($(OPAL_T38_CAP), yes)
+-SOURCES += $(OPAL_SRCDIR)/t38/sipt38.cxx
+-endif
+-
+-endif
+-endif
+-
+-##################
+-# H.224 files
+-
+-ifeq ($(OPAL_H224FECC), yes)
+-ifdef H224_AVAIL
+-
+-SOURCES += $(OPAL_SRCDIR)/h224/q922.cxx \
+-		   $(OPAL_SRCDIR)/h224/h224.cxx \
+-		   $(OPAL_SRCDIR)/h224/h281.cxx
+-endif
+-endif
+-
+-##################
+-# LIDS
+-
+-ifeq ($(OPAL_LID), yes)
+-
+-SOURCES += $(OPAL_SRCDIR)/lids/lid.cxx \
+-           $(OPAL_SRCDIR)/lids/lidep.cxx \
+-           $(OPAL_SRCDIR)/lids/lidpluginmgr.cxx \
+-
+-endif
+-
+-##################
+-# SRTP
+-
+-ifeq ($(OPAL_SRTP), yes)
+-SOURCES += $(OPAL_SRCDIR)/rtp/srtp.cxx \
+-
+-endif
+-
+-
+-####################################################
+-# Java interface
+-
+-ifeq ($(OPAL_JAVA), yes)
+-
+-JAVA_SRCDIR      = $(OPAL_SRCDIR)/java
+-JAVA_WRAPPER     = $(JAVA_SRCDIR)/java_swig_wrapper.c
+-
+-VPATH_C         += $(JAVA_SRCDIR)
+-SOURCES         += $(JAVA_WRAPPER)
+-
+-endif
+-
+-
+-##################
+-# T.38 Fax
+-
+-ifeq ($(OPAL_FAX), yes)
+-SOURCES += $(OPAL_SRCDIR)/t38/t38proto.cxx \
+-           $(ASN_SRCDIR)/t38.cxx
+-endif
+-
+-
+-
+-##################
+-# Software codecs
+-
+-SOURCES += $(OPAL_SRCDIR)/codec/g711codec.cxx \
+-           $(OPAL_SRCDIR)/codec/g711.c \
+-           $(OPAL_SRCDIR)/codec/g7231mf.cxx \
+-           $(OPAL_SRCDIR)/codec/g726mf.cxx \
+-           $(OPAL_SRCDIR)/codec/g728mf.cxx \
+-           $(OPAL_SRCDIR)/codec/g729mf.cxx \
+-           $(OPAL_SRCDIR)/codec/gsm0610mf.cxx \
+-           $(OPAL_SRCDIR)/codec/gsmamrmf.cxx \
+-           $(OPAL_SRCDIR)/codec/iLBCmf.cxx \
+-           $(OPAL_SRCDIR)/codec/t38mf.cxx \
+-           $(OPAL_SRCDIR)/codec/rfc2833.cxx \
+-           $(OPAL_SRCDIR)/codec/opalwavfile.cxx \
+-	   $(OPAL_SRCDIR)/codec/silencedetect.cxx \
+-	   $(OPAL_SRCDIR)/codec/echocancel.cxx \
+-	   $(OPAL_SRCDIR)/codec/opalpluginmgr.cxx
+-
+-ifeq ($(OPAL_VIDEO), yes)
+-SOURCES += $(OPAL_SRCDIR)/codec/vidcodec.cxx 
+-endif
+-
+-ifeq ($(OPAL_RFC4175), yes)
+-SOURCES += $(OPAL_SRCDIR)/codec/rfc4175.cxx
+-endif
+-
+-ifeq ($(OPAL_G711PLC), yes)
+-SOURCES += $(OPAL_SRCDIR)/codec/g711a1_plc.cxx
+-endif
+-
+-ifeq ($(OPAL_AEC), yes)
+-
+-ifeq ($(SPEEX_SYSTEM), no)
+-
+-SPEEX_DIR       = $(OPAL_SRCDIR)/codec/speex
+-SPEEX_INCDIR    = $(SPEEX_DIR)/libspeex
+-SPEEX_SRCDIR    = $(SPEEX_DIR)/libspeex
+-
+-VPATH_C         += $(SPEEX_SRCDIR)
+-VPATH_CXX       += $(SPEEX_SRCDIR)
+-
+-SOURCES         += $(SPEEX_SRCDIR)/speex_preprocess.c \
+-		   $(SPEEX_SRCDIR)/smallft.c \
+-                   $(SPEEX_SRCDIR)/misc.c \
+-                   $(SPEEX_SRCDIR)/mdf.c \
+-                   $(SPEEX_SRCDIR)/math_approx.c \
+-                   $(SPEEX_SRCDIR)/kiss_fftr.c \
+-                   $(SPEEX_SRCDIR)/kiss_fft.c \
+-                   $(SPEEX_SRCDIR)/fftwrap.c
+-endif # SPEEX_SYSTEM
+-
+-endif # ifeq ($(OPAL_AEC), yes)
+-
+-####################################################
+-
+-ifeq ($(OSTYPE),Darwin)
+-CFLAGS		+= -fno-common -dynamic
+-ARCHIVE			:= libtool -static -o
+-endif # Darwin
+-
+-####################################################
+-
+-ifeq ($(OSTYPE),mingw)
+-LDFLAGS += -enable-auto-import -enable-runtime-pseudo-reloc -enable-stdcall-fixup -fatal-warning
+-endif # mingw
+-
+-###############################################################################
+-# Build rules
+-
+-.SUFFIXES:	.cxx .prc 
+-
+-vpath %.cxx $(VPATH_CXX)
+-vpath %.cpp $(VPATH_CXX)
+-vpath %.c   $(VPATH_C)
+-vpath %.o   $(OPAL_OBJDIR)
+-vpath %.dep $(OPAL_DEPDIR)
+-
+-#  clean whitespace out of source file list
+-SOURCES         := $(strip $(SOURCES))
+-
+-#
+-# create list of object files 
+-#
+-SRC_OBJS := $(SOURCES:.c=.o)
+-SRC_OBJS := $(SRC_OBJS:.cxx=.o)
+-SRC_OBJS := $(SRC_OBJS:.cpp=.o)
+-OBJS	 := $(EXTERNALOBJS) $(patsubst %.o, $(OPAL_OBJDIR)/%.o, $(notdir $(SRC_OBJS) $(OBJS)))
+-
+-#
+-# create list of dependency files 
+-#
+-SRC_DEPS := $(SOURCES:.c=.dep)
+-SRC_DEPS := $(SRC_DEPS:.cxx=.dep)
+-SRC_DEPS := $(SRC_DEPS:.cpp=.dep)
+-DEPS	 := $(patsubst %.dep, $(OPAL_DEPDIR)/%.dep, $(notdir $(SRC_DEPS) $(DEPS)))
+-
+-#
+-# define rule for .cxx, .cpp and .c files
+-#
+-$(OPAL_OBJDIR)/%.o : %.cxx
+-	@if [ ! -d $(OPAL_OBJDIR) ] ; then mkdir -p $(OPAL_OBJDIR) ; fi
+-	$(CXX) $(CXXFLAGS) -c $< -o $@
+-
+-$(OPAL_OBJDIR)/%.o :  %.c 
+-	@if [ ! -d $(OPAL_OBJDIR) ] ; then mkdir -p $(OPAL_OBJDIR) ; fi
+-	$(CC) $(CFLAGS) -c $< -o $@
+-
+-#
+-# define rule for .dep files
+-#
+-$(OPAL_DEPDIR)/%.dep : %.cxx 
+-	@if [ ! -d $(OPAL_DEPDIR) ] ; then mkdir -p $(OPAL_DEPDIR) ; fi
+-	@printf %s $(OPAL_OBJDIR)/ > $@
+-	$(CXX) $(CXXFLAGS:-g=) -M $< >> $@
+-
+-$(OPAL_DEPDIR)/%.dep : %.c 
+-	@if [ ! -d $(OPAL_DEPDIR) ] ; then mkdir -p $(OPAL_DEPDIR) ; fi
+-	@printf %s $(OPAL_OBJDIR)/ > $@
+-	$(CC) $(CFLAGS:-g=) -M $< >> $@
+-
+-
+-#####################################################################
+-# Main targets
+-
+-# This target was intetionally put here since make dumbly executes the first it finds
+-# when called without an explicit target.
+-
+-default:  Makefile $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED) subdirs
+-
+-subdirs:
+-	@set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir); fi ; )
+-
+-clean:
+-	rm -rf $(OPAL_LIBDIR)
+-	@set -e; $(foreach dir,$(SUBDIRS),if test -d ${dir} ; then $(MAKE) -C $(dir) clean; fi ; )
+-
+-depend:   Makefile $(DEPS) 
+-
+-ifneq ($(wildcard $(OPAL_DEPDIR)/*.dep),)
+-include $(OPAL_DEPDIR)/*.dep
+-endif
+-
+-Makefile: Makefile.in configure
+-	@echo
+-	@echo "*******************************************************"
+-	@echo Makefile is not up to date, is a ./configure necessary?
+-	@echo "*******************************************************"
+-	@false
+-
+-ifdef JAVA_WRAPPER
+-$(JAVA_WRAPPER): $(JAVA_SRCDIR)/opal.i $(OPAL_INCDIR)/opal.h
+-	swig -java -package org.opalvoip -w451 -I$(OPAL_INCDIR) -o $@ $<
+-endif
+-
+-
+-#####################################################################
+-# Targets for the libraries
+-
+-$(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC): $(OBJS) 
+-	@if [ ! -d $(OPAL_LIBDIR) ] ; then mkdir $(OPAL_LIBDIR) ; fi
+-	$(ARCHIVE) $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) $(OBJS)
+-ifeq ($(HAVE_RANLIB),yes)
+-	$(RANLIB) $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC)
+-endif
+-
+-$(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED): $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC)
+-
+-ifeq ($(OPAL_SHARED_LIB),yes)
+-
+-  $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED): $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT)
+-	( for filename in $(LIB_FILENAME_SHARED) \
+-	                  $(LIB_FILENAME_SHARED_MAJ) \
+-	                  $(LIB_FILENAME_SHARED_MIN); \
+-	do  rm -f $(OPAL_LIBDIR)/$$filename ; ln -sf  $(LIB_FILENAME_SHARED_PAT) $(OPAL_LIBDIR)/$$filename;\
+-	done)
+-
+-  $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT): $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC)
+-	@echo EXTLIBS = $(EXTLIBS)
+-	@echo SYSLIBS = $(SYSLIBS)
+-	@if [ ! -d $(OPAL_LIBDIR) ] ; then mkdir $(OPAL_LIBDIR) ; fi
+-	$(LD) $(LDSOOPTS) -o $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(LDFLAGS) $(EXTLIBS) $(OBJS) $(LIBS)
+-
+-endif # OPAL_SHARED_LIB
+-
+-
+-#####################################################################
+-# Install targets
+-
+-install:
+-	mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)
+-	$(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_STATIC) $(DESTDIR)$(libdir)
+-	$(INSTALL) -m 755 $(OPAL_LIBDIR)/$(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)
+-	( for filename in $(LIB_FILENAME_SHARED) \
+-	                  $(LIB_FILENAME_SHARED_MAJ) \
+-	                  $(LIB_FILENAME_SHARED_MIN); \
+-	do ln -snf $(LIB_FILENAME_SHARED_PAT) $(DESTDIR)$(libdir)/$$filename ;\
+-	done)
+-
+-	mkdir -p $(DESTDIR)$(includedir)/opal; chmod 755 $(DESTDIR)$(includedir)/opal
+-	$(INSTALL) -m 644 include/opal.h $(DESTDIR)$(includedir)/opal
+-	( for dir in asn codec h323 h460 iax2 lids opal rtp sip t120 t38 zrtp; \
+-		do mkdir -p $(DESTDIR)$(includedir)/opal/$$dir ; chmod 755 $(DESTDIR)$(includedir)/opal/$$dir ; \
+-		( for fn in include/$$dir/*.h ; do \
+-			$(INSTALL) -m 644 $$fn $(DESTDIR)$(includedir)/opal/$$dir ; \
+-		done); \
+-	done)
+-
+-	mkdir -p $(DESTDIR)$(libdir)/pkgconfig ; chmod 755 $(DESTDIR)$(libdir)/pkgconfig
+-	$(INSTALL) -m 644 opal.pc $(DESTDIR)$(libdir)/pkgconfig
+-#	mkdir -p $(DESTDIR)$(datarootdir)/opal ; chmod 755 $(DESTDIR)$(datarootdir)/opal
+-
+-	$(MAKE) -C plugins install
+-
+-uninstall:
+-	( for filename in $(LIB_FILENAME_SHARED) \
+-	                  $(LIB_FILENAME_SHARED_MAJ) \
+-	                  $(LIB_FILENAME_SHARED_MIN) \
+-                          $(LIB_FILENAME_SHARED_PAT) \
+-                          $(LIB_FILENAME_STATIC); \
+-	do rm -f $(DESTDIR)$(libdir)/$$filename ;\
+-	done)
+-	rm -rf $(DESTDIR)$(includedir)/opal
+-	rm -f $(DESTDIR)$(libdir)/pkgconfig/opal.pc
+-#	rm -rf $(DESTDIR)$(datarootdir)/opal
+-
+-	$(MAKE) -C plugins uninstall
+-
+-
+-###############################################################################
+-# A collection or random useful targets
+-
+-docs: FORCE
+-	cat opal_cfg.dxy > /tmp/docs.dxy ; echo HAVE_DOT=NO >> /tmp/docs.dxy
+-	doxygen /tmp/docs.dxy
+-
+-graphdocs: FORCE
+-	cat opal_cfg.dxy > /tmp/docs.dxy ; echo HAVE_DOT=YES >> /tmp/docs.dxy
+-	doxygen /tmp/docs.dxy
+-
+-FORCE:
+-
+-opt:
+-	$(MAKE) DEBUG_BUILD=no
+-
+-optdepend:
+-	$(MAKE) DEBUG_BUILD=no depend
+-
+-debug:
+-	$(MAKE) DEBUG_BUILD=yes
+-
+-debugdepend:
+-	$(MAKE) DEBUG_BUILD=yes depend
+-
+-both: opt debug
+-
+-all: optdepend opt debugdepend debug
+-
+-update:
+-	svn -q update
+-	$(MAKE) all
+-
+-
+-# End of file #################################################################

Added: trunk/patches/ptlib-2.4.1-remove-makefile.patch
==============================================================================
--- (empty file)
+++ trunk/patches/ptlib-2.4.1-remove-makefile.patch	Wed Sep 24 10:39:19 2008
@@ -0,0 +1,147 @@
+diff -Naur ptlib-2.4.1.orig/Makefile ptlib-2.4.1/Makefile
+--- ptlib-2.4.1.orig/Makefile	2008-09-22 14:07:40.000000000 +0200
++++ ptlib-2.4.1/Makefile	1970-01-01 01:00:00.000000000 +0100
+@@ -1,143 +0,0 @@
+-#
+-# Makefile
+-#
+-# Make file for pwlib library
+-#
+-# Portable Windows Library
+-#
+-# Copyright (c) 1993-1998 Equivalence Pty. Ltd.
+-#
+-# The contents of this file are subject to the Mozilla Public License
+-# Version 1.0 (the "License"); you may not use this file except in
+-# compliance with the License. You may obtain a copy of the License at
+-# http://www.mozilla.org/MPL/
+-#
+-# Software distributed under the License is distributed on an "AS IS"
+-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+-# the License for the specific language governing rights and limitations
+-# under the License.
+-#
+-# The Original Code is Portable Windows Library.
+-#
+-# The Initial Developer of the Original Code is Equivalence Pty. Ltd.
+-#
+-# Contributor(s): ______________________________________.
+-#
+-# $Revision: 21018 $
+-# $Author: ms30002000 $
+-# $Date: 2008-09-16 15:30:43 +0000 (Tue, 16 Sep 2008) $
+-#
+-
+-PREFIX=/home/robertj/ptlib
+-exec_prefix = ${PREFIX}
+-LIBDIR=${exec_prefix}/lib_linux_x86
+-export PTLIBDIR=/home/robertj/ptlib
+-
+-INSTALL=/usr/bin/install -c
+-
+-default :: optshared
+-
+-all :: 
+-
+-TARGETDIR=unix
+-
+-include make/ptlib.mak
+-
+-SUBDIRS := src/ptlib/$(TARGETDIR)
+-ifeq (1, $(HAS_PLUGINS))
+-SUBDIRS += plugins
+-endif
+-
+-ifeq (1, $(HAS_SAMPLES))
+-SUBDIRS += samples/hello_world
+-endif
+-
+-ifeq ($(OSTYPE),mingw)
+-ARCH_INCLUDE=msos
+-else
+-ARCH_INCLUDE=unix
+-endif
+-
+-# override P_SHAREDLIB for specific targets
+-optshared   debugshared   bothshared   :: P_SHAREDLIB=1
+-optnoshared debugnoshared bothnoshared :: P_SHAREDLIB=0
+-
+-# all these targets are just passed to all subdirectories
+-$(subst tagbuild,,$(STANDARD_TARGETS)) ::
+-	set -e; $(foreach dir,$(SUBDIRS),if test -e $(dir) ; then $(MAKE) -C $(dir) $@; fi; )
+-
+-update:
+-	svn update
+-	$(MAKE) bothdepend both
+-
+-ptlib:
+-	$(MAKE) -C src/ptlib/$(TARGETDIR) both
+-
+-docs: 
+-	doxygen ptlib_cfg.dxy
+-
+-install:
+-	( for dir in $(DESTDIR)$(LIBDIR) \
+-		     $(DESTDIR)$(PREFIX)/bin \
+-		     $(DESTDIR)$(PREFIX)/include/ptlib \
+-                     $(DESTDIR)$(PREFIX)/include/ptlib/$(ARCH_INCLUDE)/ptlib \
+-                     $(DESTDIR)$(PREFIX)/include/ptclib \
+-                     $(DESTDIR)$(PREFIX)/share/ptlib/make ; \
+-		do mkdir -p $$dir ; chmod 755 $$dir ; \
+-	done )
+-	$(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE).2.5-beta0 $(DESTDIR)$(LIBDIR)
+-	$(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a $(DESTDIR)$(LIBDIR)
+-	(cd $(DESTDIR)$(LIBDIR) ; \
+-		rm -f  $(PTLIB_FILE).2.5 ; \
+-		ln -sf $(PTLIB_FILE).2.5-beta0 $(PTLIB_FILE).2.5 \
+-	)
+-	(cd $(DESTDIR)$(LIBDIR) ; \
+-		rm -f  $(PTLIB_FILE).2 ; \
+-		ln -sf $(PTLIB_FILE).2.5-beta0 $(PTLIB_FILE).2 \
+-	)
+-	(cd $(DESTDIR)$(LIBDIR) ; \
+-		rm -f  $(PTLIB_FILE) ; \
+-		ln -sf $(PTLIB_FILE).2.5-beta0 $(PTLIB_FILE) \
+-	)
+-ifeq (1, $(HAS_PLUGINS))
+-	cd $(PT_LIBDIR)/device/ ; \
+-	( for dir in ./* ;\
+-		do mkdir -p $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir ; \
+-		chmod 755 $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir ; \
+-		(for fn in ./$$dir/*.so ; \
+-			do $(INSTALL) -m 444 $$fn $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR)/$$dir; \
+-		done ); \
+-	done )
+-endif
+-	$(INSTALL) -m 444 include/ptlib.h                $(DESTDIR)$(PREFIX)/include
+-	$(INSTALL) -m 444 include/ptbuildopts.h          $(DESTDIR)$(PREFIX)/include
+-	(for fn in include/ptlib/*.h include/ptlib/*.inl; \
+-		do $(INSTALL) -m 444 $$fn $(DESTDIR)$(PREFIX)/include/ptlib; \
+-	done)
+-	(for fn in include/ptlib/$(ARCH_INCLUDE)/ptlib/*.h include/ptlib/$(ARCH_INCLUDE)/ptlib/*.inl ; \
+-		do $(INSTALL) -m 444 $$fn $(DESTDIR)$(PREFIX)/include/ptlib/$(ARCH_INCLUDE)/ptlib ; \
+-	done)
+-	(for fn in include/ptclib/*.h ; \
+-		do $(INSTALL) -m 444 $$fn $(DESTDIR)$(PREFIX)/include/ptclib; \
+-	done)
+-	(for fn in make/*.mak ; \
+-		do $(INSTALL) -m 444 $$fn $(DESTDIR)$(PREFIX)/share/ptlib/make; \
+-	done)
+-	$(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
+-	(cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
+-
+-	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+-	chmod 755 $(DESTDIR)$(LIBDIR)/pkgconfig
+-	$(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
+-uninstall:
+-	rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
+-	       $(DESTDIR)$(PREFIX)/include/ptclib \
+-	       $(DESTDIR)$(PREFIX)/include/ptlib.h \
+-	       $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
+-	       $(DESTDIR)$(PREFIX)/share/ptlib \
+-	       $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
+-	       $(DESTDIR)$(LIBDIR)/pkgconfig/ptlib.pc
+-	rm -f $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE)* \
+-	      $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a
+-
+-# End of Makefile.in
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]