summaryrefslogtreecommitdiff
path: root/net/openh323/patches/patch-aa
blob: ee8f96fdbd1bc708bd55032a9e913003758d13a9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
$NetBSD: patch-aa,v 1.2 2002/04/09 10:55:01 agc Exp $

--- src/Makefile.orig	Fri Jul 14 13:38:56 2000
+++ src/Makefile	Tue Apr  9 11:42:33 2002
@@ -97,7 +97,7 @@
 PWLIBDIR=$(HOME)/pwlib
 endif
 
-include $(PWLIBDIR)/make/unix.mak
+include $(PWLIBDIR)/share/pwlib/make/unix.mak
 
 ifndef OPENH323DIR
 OPENH323DIR=$(HOME)/openh323
@@ -322,13 +322,13 @@
 
 ####################################################
 
-include $(PWLIBDIR)/make/common.mak
+include $(PWLIBDIR)/share/pwlib/make/common.mak
 
 ####################################################
 
 LIB_BASENAME	=	$(OH323_FILE)
 
-include $(PWLIBDIR)/make/lib.mak
+include $(PWLIBDIR)/share/pwlib/make/lib.mak
 
 ####################################################
 
@@ -339,8 +339,8 @@
 ASNPARSE = $(ASNPARSE_DIR)/obj_$(PLATFORM_TYPE)_r/asnparser 
 ASNPARSE += -x $(ASN_EXCLUDE)
 else
-ASNPARSE_DIR = $(PWLIBDIR)/tools/asnparser
-ASNPARSE = $(ASNPARSE_DIR)/obj_$(PLATFORM_TYPE)_r/asnparser 
+ASNPARSE_DIR = 
+ASNPARSE = ${PREFIX}/bin/asnparser
 endif
 
 #### h245
@@ -413,45 +413,45 @@
 
 $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.cxx
 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
-	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
+	${LIBTOOL} --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
 
 $(OH323_OBJDIR)/%.o : $(VIC_DIR)/%.c
 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
-	$(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
+	${LIBTOOL} --tag=CC $(CC) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -c $< -o $@
 
 $(DEPDIR)/%.dep : $(VIC_DIR)/%.c
 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
 	@printf %s $(OH323_OBJDIR)/ > $@
-	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
+	${LIBTOOL} --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
 
 $(DEPDIR)/%.dep : $(VIC_DIR)/%.cxx
 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
 	@printf %s $(OH323_OBJDIR)/ > $@
-	$(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
+	${LIBTOOL} --tag=CXX $(CPLUS) -I$(VIC_DIR) $(STDCCFLAGS) $(CFLAGS) -M $< >> $@
 
 
 # Build rules for the GSM codec
 
 $(OH323_OBJDIR)/%.o : $(GSM_SRCDIR)/%.c
 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
-	$(CC) -ansi -I$(GSM_INCDIR) -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+	${LIBTOOL} --tag=CC $(CC) -ansi -I$(GSM_INCDIR) -DNeedFunctionPrototypes=1 $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
 
 $(DEPDIR)/%.dep : $(GSM_SRCDIR)/%.c
 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
 	@printf %s $(OH323_OBJDIR)/ > $@
-	$(CC) -ansi -I$(GSM_INCDIR) -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
+	${LIBTOOL} --tag=CC $(CC) -ansi -I$(GSM_INCDIR) -DNeedFunctionPrototypes=1 $(CFLAGS) -M $< >> $@
 
 
 # Build rules for the LPC10 codec
 
 $(OH323_OBJDIR)/%.o : $(LPC10_SRCDIR)/%.c
 	@if [ ! -d $(OH323_OBJDIR) ] ; then mkdir -p $(OH323_OBJDIR) ; fi
-	$(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+	${LIBTOOL} --tag=CC $(CC) -I$(LPC10_INCDIR) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
 
 $(DEPDIR)/%.dep : $(LPC10_SRCDIR)/%.c
 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
 	@printf %s $(OH323_OBJDIR)/ > $@
-	$(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@
+	${LIBTOOL} --tag=CC $(CC) -I$(LPC10_INCDIR) $(CFLAGS) -M $< >> $@
 
 
 # Pass through commands to the subdirectory for test app