diff -Naur iaxclient-1.0-20050410/simpleclient/iax2slin/Makefile iaxclient-1.0-20050410.oden/simpleclient/iax2slin/Makefile --- iaxclient-1.0-20050410/simpleclient/iax2slin/Makefile 2005-03-11 01:04:57.000000000 +0100 +++ iaxclient-1.0-20050410.oden/simpleclient/iax2slin/Makefile 2005-04-11 02:50:21.000000000 +0200 @@ -1,12 +1,9 @@ - -CFLAGS=-I../../lib -I../../lib/libiax/src -I../../lib/gsm/inc -I../../lib/portaudio/pa_common -I../../lib/portaudio/pablio -Iinclude - -#debug -CFLAGS:= $(CFLAGS) -g +CFLAGS= $(RPM_OPT_FLAGS) +CFLAGS+=-I../../lib -Iinclude -I. -I/usr/include/speex -I/usr/include/gsm -I/usr/include/iax -I/usr/include/ilbc OBJS= iax2slin.o -LIBS= ../../lib/libiaxclient.a +LIBS= EXEEXT= @@ -56,7 +53,7 @@ ifeq ($(OSTYPEREAL),FREEBSD) SYSLIBS=-lc_r -lm else -SYSLIBS=-lpthread -lm +SYSLIBS=-lpthread -lm -L../../lib -liaxclient -lgsm -lportaudio -lportmixer -lspeex -liax -lilbc endif endif @@ -73,7 +70,7 @@ PROGS= iax2slin$(EXEEXT) -all: makelib $(PROGS) +all: $(PROGS) clean: rm -f $(OBJS) $(PROGS) @@ -85,6 +82,5 @@ (cd ../../lib; $(MAKE) libiaxclient.a) iax2slin$(EXEEXT): $(OBJS) $(LIBS) - gcc $(OBJS) $(LIBS) $(SYSLIBS) -o iax2slin$(EXEEXT) - + gcc $(CFLAGS) $(OBJS) $(LIBS) $(SYSLIBS) -o iax2slin$(EXEEXT) diff -Naur iaxclient-1.0-20050410/simpleclient/iaxphone/Makefile iaxclient-1.0-20050410.oden/simpleclient/iaxphone/Makefile --- iaxclient-1.0-20050410/simpleclient/iaxphone/Makefile 2003-07-22 00:17:21.000000000 +0200 +++ iaxclient-1.0-20050410.oden/simpleclient/iaxphone/Makefile 2005-04-11 02:51:03.000000000 +0200 @@ -1,5 +1,5 @@ - -CFLAGS=-I../../lib -I../../lib/libiax/src -I../../lib/gsm/inc -I../../lib/portaudio/pa_common -I../../lib/portaudio/pablio -Iinclude +CFLAGS=$(RPM_OPT_FLAGS) +CFLAGS+=-I../../lib -Iinclude -I. -I/usr/include/speex -I/usr/include/gsm -I/usr/include/iax -I/usr/include/ilbc #debug CFLAGS:= $(CFLAGS) -g @@ -7,7 +7,7 @@ REZ=echo -LIBS= ../../lib/libiaxclient.a +LIBS= EXEEXT= @@ -43,8 +43,8 @@ ifeq ($(OSTYPE),LINUX) PROG=iaxphone TARGET=iaxphone -CFLAGS:= $(CFLAGS) -DPOSIXSLEEP `wx-config --cflags` `gtk-config --cflags` -SYSLIBS=-lpthread -lm `wx-config --static --libs` +CFLAGS:= $(CFLAGS) -DPOSIXSLEEP `wx-config-ansi --cflags` `pkg-config --cflags gdk-2.0` +SYSLIBS=-lpthread -lm `wx-config-ansi --libs` -L../../lib -liaxclient -lgsm -lportaudio -lportmixer -lspeex -liax -lilbc endif ifeq ($(OSTYPE),MACOSX) @@ -58,7 +58,7 @@ CPPFLAGS = $(CFLAGS) -all: makelib $(TARGET) +all: $(TARGET) clean: rm -f $(OBJS) $(PROG) @@ -70,7 +70,7 @@ (cd ../../lib; make libiaxclient.a) $(PROG): $(OBJS) $(LIBS) - $(CXX) $(OBJS) $(LIBS) $(SYSLIBS) -o $(PROG) + $(CXX) $(CFLAGS) $(OBJS) $(LIBS) $(SYSLIBS) -o $(PROG) $(PROG).app: $(OBJS) $(LIBS) mkdir -p $(PROG).app/Contents/MacOS $(PROG).app/Contents/Resources diff -Naur iaxclient-1.0-20050410/simpleclient/wx/Makefile iaxclient-1.0-20050410.oden/simpleclient/wx/Makefile --- iaxclient-1.0-20050410/simpleclient/wx/Makefile 2003-11-15 04:10:14.000000000 +0100 +++ iaxclient-1.0-20050410.oden/simpleclient/wx/Makefile 2005-04-11 02:53:21.000000000 +0200 @@ -1,5 +1,6 @@ -CFLAGS=-I../../lib +CFLAGS=$(RPM_OPT_FLAGS) +CFLAGS+=-I../../lib -I. -I/usr/include/speex -I/usr/include/gsm -I/usr/include/iax -I/usr/include/ilbc #debug CFLAGS:= $(CFLAGS) -g @@ -44,8 +45,8 @@ ifeq ($(OSTYPE),LINUX) PROG=wx TARGET=wx -CFLAGS:= $(CFLAGS) `wx-config --cflags` `gtk-config --cflags` -SYSLIBS=-lpthread -lm `wx-config --static --libs` +CFLAGS+= `wx-config-ansi --cxxflags` `pkg-config --cflags gdk-2.0` +SYSLIBS= -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXrandr -lXi -lXinerama -lXext -lXft -lXrender -lpthread -lm -L../../lib -liaxclient -lgsm -lportaudio -lportmixer -lspeex -liax -lilbc `wx-config-ansi --libs` -lwx_gtk2_xrc-2.6 `wx-config-ansi --cxxflags` `pkg-config --libs-only-l gdk-2.0` `gdlib-config --libs` endif ifeq ($(OSTYPE),MACOSX) @@ -59,7 +60,7 @@ CPPFLAGS = $(CFLAGS) -all: makelib $(TARGET) +all: $(TARGET) clean: rm -f $(OBJS) $(PROG) diff -Naur iaxclient/simpleclient/iaxcomm/Makefile.orig iaxclient/simpleclient/iaxcomm/Makefile --- iaxclient/simpleclient/iaxcomm/Makefile.orig 2006-06-10 16:01:03.000000000 +0200 +++ iaxclient/simpleclient/iaxcomm/Makefile 2006-06-10 20:29:19.000000000 +0200 @@ -4,18 +4,19 @@ # PROVIDER=asterisk VERSION=1.1.0final -CFLAGS=-I../../lib +CFLAGS=$(RPM_OPT_FLAGS) +CFLAGS+=-I../../lib -I. -I/usr/include/speex -I/usr/include/gsm -I/usr/include/iax -I/usr/include/ilbc REZFLAGS=/usr/local/include/wx-2.6 #debug -CFLAGS:= $(CFLAGS) -g -Wall -DVERSION='"$(VERSION)"' +CFLAGS+= -DVERSION='"$(VERSION)"' OBJS = main.o prefs.o calls.o directory.o dial.o frame.o devices.o xrc_res.o accounts.o ringer.o XRCS = rc/devices.xrc rc/directory.xrc rc/frame.xrc rc/menubar.xrc rc/panel.xrc rc/prefs.xrc REZ=echo -LIBS= ../../lib/libiaxclient.a +LIBS= EXEEXT= @@ -63,9 +64,9 @@ #SYSLIBS=$(EXTRALIBS) -lpthread -lm `wx-config --static --libs` # Suitable settings for wxwidgets 2.6.1 for GTK 2.x and Unicode -CFLAGS:= $(CFLAGS) -D__UNICODE__ -DUNICODE `wx-config --cflags` `pkg-config --cflags gtk+-2.0` -EXTRALIBS = -lwx_gtk2u_xrc-2.6 -SYSLIBS=$(EXTRALIBS) -lpthread -lm `wx-config --libs` +CFLAGS+= `wx-config-ansi --cxxflags` `pkg-config --cflags gdk-2.0` +EXTRALIBS= +SYSLIBS= -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXrandr -lXi -lXinerama -lXext -lXft -lXrender -lpthread -lm -L../../lib -liaxclient -lgsm -lportaudio -lportmixer -lspeex -liax -lilbc `wx-config-ansi --libs` -lwx_gtk2_xrc-2.6 `wx-config-ansi --cxxflags` `pkg-config --libs-only-l gdk-2.0` `gdlib-config --libs` endif ifeq ($(OSTYPE),MACOSX) @@ -80,7 +81,7 @@ CPPFLAGS = $(CFLAGS) -all: makelib $(TARGET) +all: $(TARGET) clean: rm -f $(OBJS) $(PROG) @@ -103,6 +104,7 @@ upx -9 $(TARGET) $(PROG): $(OBJS) $(LIBS) +# $(CXX) $(CFLAGS) $(OBJS) $(LIBS) $(SYSLIBS) -o $(PROG) $(CXX) $(OBJS) $(LIBS) $(SYSLIBS) -o $(PROG) $(PROG).app: $(OBJS) $(LIBS) diff -Naur iaxclient/simpleclient/testcall/Makefile.orig iaxclient/simpleclient/testcall/Makefile --- iaxclient/simpleclient/testcall/Makefile.orig 2006-06-10 16:00:58.000000000 +0200 +++ iaxclient/simpleclient/testcall/Makefile 2006-06-10 20:35:19.000000000 +0200 @@ -1,14 +1,11 @@ -CFLAGS=-I../../lib -I../../lib/libiax/src -I../../lib/gsm/inc -I../../lib/portaudio/pa_common -I../../lib/portaudio/pablio -Iinclude +CFLAGS=$(RPM_OPT_FLAGS) +CFLAGS+=-I../../lib -Iinclude -I. -I/usr/include/speex -I/usr/include/gsm -I/usr/include/iax -I/usr/include/ilbc LDFLAGS= - -#debug -CFLAGS:= $(CFLAGS) -g - OBJS= testcall.o -LIBS= ../../lib/libiaxclient.a +LIBS= EXEEXT= @@ -62,7 +59,7 @@ ifeq ($(OSTYPEREAL),FREEBSD) SYSLIBS=-lc_r -lm else -SYSLIBS=-lpthread -lm +SYSLIBS=-lpthread -lm -L../../lib -liaxclient -lgsm -lportaudio -lportmixer -lspeex -liax -lilbc -lm -lpthread endif endif @@ -83,7 +80,7 @@ PROGS= testcall$(EXEEXT) testcall-jb$(EXEEXT) endif -all: makelib $(PROGS) +all: $(PROGS) clean: rm -f $(OBJS) $(PROGS) @@ -95,8 +92,8 @@ (cd ../../lib; $(MAKE) libiaxclient.a) testcall$(EXEEXT): $(OBJS) $(LIBS) - $(CC) $(OBJS) $(LIBS) $(SYSLIBS) -o testcall$(EXEEXT) + $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(SYSLIBS) -o testcall$(EXEEXT) testcall-jb$(EXEEXT): testcall-jb.o $(LIBS) - $(CC) testcall-jb.o $(LIBS) $(SYSLIBS) -o testcall-jb$(EXEEXT) + $(CC) $(CFLAGS) testcall-jb.o $(LIBS) $(SYSLIBS) -o testcall-jb$(EXEEXT) diff -Naur iaxclient/simpleclient/tkphone/Makefile.orig iaxclient/simpleclient/tkphone/Makefile --- iaxclient/simpleclient/tkphone/Makefile.progs 2006-06-10 16:00:58.000000000 +0200 +++ iaxclient/simpleclient/tkphone/Makefile 2006-06-10 18:48:42.000000000 +0200 @@ -1,13 +1,11 @@ ROOT=../.. -CFLAGS=-I$(ROOT)/lib -I$(ROOT)/lib/libiax/src -I$(ROOT)/lib/gsm/inc -I$(ROOT)/lib/portaudio/pa_common -I$(ROOT)/lib/portaudio/pablio -Iinclude - -#debug -CFLAGS:= $(CFLAGS) -g -Wall +CFLAGS= $(RPM_OPT_FLAGS) +CFLAGS+=-I../../lib -Iinclude -I. -I/usr/include/speex -I/usr/include/gsm -I/usr/include/iax -I/usr/include/ilbc OBJS= iaxcli.o tones.o -LIBS= $(ROOT)/lib/libiaxclient.a +LIBS= EXEEXT= @@ -60,15 +58,16 @@ endif ifeq ($(OSTYPE),LINUX) -CFLAGS:= $(CFLAGS) -DPOSIXSLEEP +CFLAGS+= -DPOSIXSLEEP ifeq ($(OSTYPEREAL),FREEBSD) SYSLIBS=-lc_r -lm else -SYSLIBS=-lpthread -lm +CFLAGS+= `pkg-config --cflags gdk-2.0` +SYSLIBS= -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -lXrandr -lXi -lXinerama -lXext -lXft -lXrender -lpthread -lm -L../../lib -liaxclient -lgsm -lportaudio -lportmixer -lspeex -liax -lilbc `pkg-config --libs-only-l gdk-2.0` endif ifeq ($(USE_HOTKEY),1) -CFLAGS:= $(CFLAGS) `gtk-config --cflags` -SYSLIBS:= $(SYSLIBS) `gtk-config --libs` +CFLAGS+= `pkg-config --cflags gdk-2.0` +SYSLIBS+= `pkg-config --libs-only-l gdk-2.0` endif endif @@ -98,9 +97,9 @@ EXEEXT=-$(shell uname -s)-$(shell uname -m) endif -PROGS= iaxcli$(EXEEXT) +PROGS= iaxcli -all: makelib $(PROGS) +all: $(PROGS) clean: rm -f $(OBJS) $(PROGS) @@ -111,5 +110,5 @@ $(ROOT)/lib/libiaxclient.a: (cd $(ROOT)/lib; $(MAKE) libiaxclient.a) -iaxcli$(EXEEXT): $(OBJS) $(LIBS) - gcc $(OBJS) $(LIBS) $(SYSLIBS) -o iaxcli$(EXEEXT) +iaxcli: $(OBJS) $(LIBS) + gcc $(CFLAGS) $(OBJS) $(LIBS) $(SYSLIBS) -o iaxcli