]>
Commit | Line | Data |
---|---|---|
aec8bf58 | 1 | diff -uNr cphone-0.3.1/Makefile cphone-0.3.1-new/Makefile |
2 | --- cphone-0.3.1/Makefile 2003-08-07 00:39:42.000000000 +0000 | |
3 | +++ cphone-0.3.1-new/Makefile 2004-01-29 16:35:50.000000000 +0000 | |
4 | @@ -117,7 +117,7 @@ | |
c2685d84 PG |
5 | UIC = $(QTDIR)/bin/uic |
6 | MOC = $(QTDIR)/bin/moc | |
7 | ||
8 | -STDCCFLAGS += -I$(QTDIR)/include -DQT_THREAD_SUPPORT | |
9 | +STDCCFLAGS += -I$(QTDIR)/include/qt -DQT_THREAD_SUPPORT | |
aec8bf58 | 10 | LDFLAGS += -L$(QTLIBDIR) -L$(XLIBDIR) |
c2685d84 PG |
11 | ENDLDLIBS += -lqt-mt -lSM -lICE -lXext -lX11 |
12 | ifeq ($(OSTYPE),linux) | |
aec8bf58 | 13 | @@ -141,7 +141,7 @@ |
c2685d84 PG |
14 | OPENH323DIR=$(HOME)/openh323 |
15 | endif | |
16 | ||
17 | -include $(OPENH323DIR)/openh323u.mak | |
18 | +include $(OPENH323DIR)/share/openh323/openh323u.mak | |
19 | ||
20 | ################################################## | |
21 | ||
aec8bf58 | 22 | diff -uNr cphone-0.3.1/Makefile~ cphone-0.3.1-new/Makefile~ |
23 | --- cphone-0.3.1/Makefile~ 1970-01-01 00:00:00.000000000 +0000 | |
24 | +++ cphone-0.3.1-new/Makefile~ 2003-08-07 00:39:42.000000000 +0000 | |
25 | @@ -0,0 +1,179 @@ | |
26 | +# | |
27 | +# The contents of this file are subject to the Mozilla Public License | |
28 | +# Version 1.0 (the "License"); you may not use this file except in | |
29 | +# compliance with the License. You may obtain a copy of the License at | |
30 | +# http://www.mozilla.org/MPL/ | |
31 | +# | |
32 | +# Software distributed under the License is distributed on an "AS IS" | |
33 | +# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See | |
34 | +# the License for the specific language governing rights and limitations | |
35 | +# under the License. | |
36 | +# | |
37 | +# The Original Code is CPhone, a cross platform voip gui. | |
38 | +# | |
39 | +# The Initial Developer of the Original Code is Derek Smithies. | |
40 | +# | |
41 | +# Copyright (C) 2002 Indranet Technologies Ltd, | |
42 | +# http://www.indranet-technologies.com | |
43 | +# All Rights Reserved. | |
44 | +# | |
45 | +# Contributor(s): _______________ | |
46 | +# | |
47 | + | |
48 | +# | |
49 | +# | |
50 | +# $Log$ | |
51 | +# Revision 1.7 2003/07/21 14:54:18 peternixon | |
52 | +# Needed for the AMD64 architecture where 32 and 64 bit libraries can reside side-by-side. | |
53 | +# | |
54 | +# Revision 1.6 2003/05/15 19:49:15 peternixon | |
55 | +# Remove support for qt2 as cphone no longer works with it | |
56 | +# | |
57 | +# Revision 1.5 2003/05/13 09:18:14 peternixon | |
58 | +# Use QT3 by default if available | |
59 | +# | |
60 | +# Revision 1.4 2003/05/09 03:08:24 dereksmithies | |
61 | +# Fix Microtelco handling, and message display | |
62 | +# | |
63 | +# Revision 1.3 2003/02/03 09:15:06 rogerhardiman | |
64 | +# Add extra QTDIR search to find QT on my FreeBSD system | |
65 | +# | |
66 | +# Revision 1.2 2002/11/28 22:51:59 dereksmithies | |
67 | +# Add switch so it compiles on FreeBSD. Thanks Roger Hardiman | |
68 | +# | |
69 | +# Revision 1.1.1.1 2002/05/12 22:55:00 dereksmithies | |
70 | +# Initial release. | |
71 | +# | |
72 | +# | |
73 | +# | |
74 | +# | |
75 | + | |
76 | +PROG = cphone | |
77 | + | |
78 | +SOURCES := \ | |
79 | + addressbookSub.cxx \ | |
80 | + audiopropertiesSub.cxx \ | |
81 | + callanswerSub.cxx \ | |
82 | + cpendpoint.cxx \ | |
83 | + main.cxx \ | |
84 | + mainwindowSub.cxx \ | |
85 | + message.cxx \ | |
86 | + options.cxx \ | |
87 | + precompile.cxx \ | |
88 | + qtvid.cxx \ | |
89 | + settingsSub.cxx \ | |
90 | + vdisplay.cxx \ | |
91 | + videopropertiesSub.cxx | |
92 | + | |
93 | +UIFILES := \ | |
94 | + addressbook.ui \ | |
95 | + audioproperties.ui \ | |
96 | + callanswer.ui \ | |
97 | + mainwindow.ui \ | |
98 | + settings.ui \ | |
99 | + videoproperties.ui | |
100 | + | |
101 | +MOCFILES := \ | |
102 | + vdisplay.h | |
103 | + | |
104 | + | |
105 | +# message.h \ | |
106 | + | |
107 | + | |
108 | + | |
109 | + | |
110 | +################################################## | |
111 | + | |
112 | +ifndef QTDIR | |
113 | +ifneq (,$(wildcard /usr/local/qt)) | |
114 | +QTDIR=/usr/local/qt | |
115 | +else | |
116 | +ifneq (,$(wildcard /usr/lib/qt3)) | |
117 | +QTDIR=/usr/lib/qt3 | |
118 | +else | |
119 | +ifneq (,$(wildcard ~/qt)) | |
120 | +QTDIR=~/qt | |
121 | +else | |
122 | +ifneq (,$(wildcard ../qt)) | |
123 | +QTDIR=../qt | |
124 | +else | |
125 | +ifneq (,$(wildcard /usr/X11R6/include/qapplication.h)) | |
126 | +QTDIR=/usr/X11R6 | |
127 | +endif | |
128 | +endif | |
129 | +endif | |
130 | +endif | |
131 | +endif | |
132 | +endif | |
133 | + | |
134 | +ifndef XLIBDIR | |
135 | +XLIBDIR=/usr/X11R6/lib | |
136 | +endif | |
137 | +ifndef QTLIBDIR | |
138 | +QTLIBDIR=$(QTDIR)/lib | |
139 | +endif | |
140 | + | |
141 | + | |
142 | +UIC = $(QTDIR)/bin/uic | |
143 | +MOC = $(QTDIR)/bin/moc | |
144 | + | |
145 | +STDCCFLAGS += -I$(QTDIR)/include -DQT_THREAD_SUPPORT | |
146 | +LDFLAGS += -L$(QTLIBDIR) -L$(XLIBDIR) | |
147 | +ENDLDLIBS += -lqt-mt -lSM -lICE -lXext -lX11 | |
148 | +ifeq ($(OSTYPE),linux) | |
149 | +ENDLDLIBS += -ldl | |
150 | +endif | |
151 | + | |
152 | +UISRC := $(patsubst %.ui,%.cxx,$(UIFILES)) | |
153 | +UIHDRS := $(patsubst %.ui,%.h,$(UIFILES)) | |
154 | + | |
155 | +MOCFILES += $(UIHDRS) | |
156 | +MOCSRCRAW := $(addprefix moc_, $(MOCFILES)) | |
157 | +MOCSRC := $(patsubst %.h,%.cxx,$(MOCSRCRAW)) | |
158 | + | |
159 | + | |
160 | +SOURCES += $(MOCSRC) $(UISRC) | |
161 | + | |
162 | + | |
163 | +################################################## | |
164 | + | |
165 | +ifndef OPENH323DIR | |
166 | +OPENH323DIR=$(HOME)/openh323 | |
167 | +endif | |
168 | + | |
169 | +include $(OPENH323DIR)/openh323u.mak | |
170 | + | |
171 | +################################################## | |
172 | + | |
173 | +%.cxx %.h : %.ui | |
174 | + $(UIC) -impl $*.h $*.ui > $*.cxx | |
175 | + $(UIC) $*.ui > $*.h | |
176 | + | |
177 | +moc_%.cxx: %.h | |
178 | + $(MOC) -f$*.h -o $@ < $*.h | |
179 | + | |
180 | + | |
181 | +.PRECIOUS: $(UIHDRS) $(MOCSRC) | |
182 | + | |
183 | +clean:: | |
184 | + rm -f $(UISRC) $(UIHDRS) $(MOCSRC) | |
185 | + | |
186 | + | |
187 | +main.cxx : mainwindow.h | |
188 | + | |
189 | +addressbookSub.cxx : addressbook.h mainwindow.h callanswer.h | |
190 | + | |
191 | +audiopropertiesSub.cxx : audioproperties.h mainwindow.h | |
192 | + | |
193 | +callanswerSub.cxx : callanswer.h mainwindow.h | |
194 | + | |
195 | +mainwindowSub.cxx : $(UIHDRS) | |
196 | + | |
197 | +options.cxx : mainwindow.h | |
198 | + | |
199 | +settingsSub.cxx : settings.h mainwindow.h | |
200 | + | |
201 | +videopropertiesSub.cxx : videoproperties.h mainwindow.h | |
202 | + | |
203 | +# End of File #################################### | |
204 | + |