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
8 -STDCCFLAGS += -I$(QTDIR)/include -DQT_THREAD_SUPPORT
9 +STDCCFLAGS += -I$(QTDIR)/include/qt -DQT_THREAD_SUPPORT
10 LDFLAGS += -L$(QTLIBDIR) -L$(XLIBDIR)
11 ENDLDLIBS += -lqt-mt -lSM -lICE -lXext -lX11
12 ifeq ($(OSTYPE),linux)
14 OPENH323DIR=$(HOME)/openh323
17 -include $(OPENH323DIR)/openh323u.mak
18 +include $(OPENH323DIR)/share/openh323/openh323u.mak
20 ##################################################
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
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/
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
37 +# The Original Code is CPhone, a cross platform voip gui.
39 +# The Initial Developer of the Original Code is Derek Smithies.
41 +# Copyright (C) 2002 Indranet Technologies Ltd,
42 +# http://www.indranet-technologies.com
43 +# All Rights Reserved.
45 +# Contributor(s): _______________
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.
54 +# Revision 1.6 2003/05/15 19:49:15 peternixon
55 +# Remove support for qt2 as cphone no longer works with it
57 +# Revision 1.5 2003/05/13 09:18:14 peternixon
58 +# Use QT3 by default if available
60 +# Revision 1.4 2003/05/09 03:08:24 dereksmithies
61 +# Fix Microtelco handling, and message display
63 +# Revision 1.3 2003/02/03 09:15:06 rogerhardiman
64 +# Add extra QTDIR search to find QT on my FreeBSD system
66 +# Revision 1.2 2002/11/28 22:51:59 dereksmithies
67 +# Add switch so it compiles on FreeBSD. Thanks Roger Hardiman
69 +# Revision 1.1.1.1 2002/05/12 22:55:00 dereksmithies
79 + addressbookSub.cxx \
80 + audiopropertiesSub.cxx \
91 + videopropertiesSub.cxx
95 + audioproperties.ui \
110 +##################################################
113 +ifneq (,$(wildcard /usr/local/qt))
116 +ifneq (,$(wildcard /usr/lib/qt3))
119 +ifneq (,$(wildcard ~/qt))
122 +ifneq (,$(wildcard ../qt))
125 +ifneq (,$(wildcard /usr/X11R6/include/qapplication.h))
135 +XLIBDIR=/usr/X11R6/lib
138 +QTLIBDIR=$(QTDIR)/lib
142 +UIC = $(QTDIR)/bin/uic
143 +MOC = $(QTDIR)/bin/moc
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)
152 +UISRC := $(patsubst %.ui,%.cxx,$(UIFILES))
153 +UIHDRS := $(patsubst %.ui,%.h,$(UIFILES))
155 +MOCFILES += $(UIHDRS)
156 +MOCSRCRAW := $(addprefix moc_, $(MOCFILES))
157 +MOCSRC := $(patsubst %.h,%.cxx,$(MOCSRCRAW))
160 +SOURCES += $(MOCSRC) $(UISRC)
163 +##################################################
166 +OPENH323DIR=$(HOME)/openh323
169 +include $(OPENH323DIR)/openh323u.mak
171 +##################################################
174 + $(UIC) -impl $*.h $*.ui > $*.cxx
175 + $(UIC) $*.ui > $*.h
178 + $(MOC) -f$*.h -o $@ < $*.h
181 +.PRECIOUS: $(UIHDRS) $(MOCSRC)
184 + rm -f $(UISRC) $(UIHDRS) $(MOCSRC)
187 +main.cxx : mainwindow.h
189 +addressbookSub.cxx : addressbook.h mainwindow.h callanswer.h
191 +audiopropertiesSub.cxx : audioproperties.h mainwindow.h
193 +callanswerSub.cxx : callanswer.h mainwindow.h
195 +mainwindowSub.cxx : $(UIHDRS)
197 +options.cxx : mainwindow.h
199 +settingsSub.cxx : settings.h mainwindow.h
201 +videopropertiesSub.cxx : videoproperties.h mainwindow.h
203 +# End of File ####################################