Moved the Gtk+ 3 compilation directives together

This commit is contained in:
Pierre Pronchery 2014-10-21 23:37:40 +02:00
parent dc33335459
commit a165a92bcc
3 changed files with 9 additions and 8 deletions

View File

@ -10,10 +10,10 @@ dist=Makefile,hayes/command.h,hayes/quirks.h,osmocom.c
[debug]
type=plugin
sources=debug.c
#cflags=`pkg-config --cflags gtk+-3.0 libSystem`
cflags=`pkg-config --cflags gtk+-2.0 libSystem`
#ldflags=`pkg-config --libs gtk+-3.0 libSystem`
ldflags=`pkg-config --libs gtk+-2.0 libSystem`
#cflags=`pkg-config --cflags gtk+-3.0 libSystem`
#ldflags=`pkg-config --libs gtk+-3.0 libSystem`
install=$(LIBDIR)/Phone/modem
[debug.c]

View File

@ -2,11 +2,12 @@ subdirs=16x16,24x24,32x32,48x48
targets=blacklist,debug,engineering,gprs,gps,locker,n900,notify,openmoko,oss,panel,password,profiles,smscrypt,systray,template,ussd,video
cppflags_force=-I ../../include
cppflags=
#cflags_force=-W `pkg-config --cflags libSystem gtk+-3.0`
cflags_force=-W `pkg-config --cflags libSystem gtk+-2.0`
cflags=-Wall -g -O2 -pedantic -fPIC
#ldflags_force=`pkg-config --cflags libSystem gtk+-3.0`
ldflags_force=`pkg-config --cflags libSystem gtk+-2.0`
#cflags_force=-W `pkg-config --cflags libSystem gtk+-3.0`
#cflags=-Wall -g -O2 -pedantic -fPIC
#ldflags_force=`pkg-config --cflags libSystem gtk+-3.0`
dist=Makefile
[blacklist]

View File

@ -7,10 +7,10 @@ dist=Makefile,common.c
[engineering]
type=binary
#cflags=`pkg-config --cflags libSystem gtk+-3.0`
cflags=`pkg-config --cflags libSystem gtk+-2.0`
#ldflags=`pkg-config --libs libSystem gtk+-3.0`
ldflags=`pkg-config --libs libSystem gtk+-2.0`
#cflags=`pkg-config --cflags libSystem gtk+-3.0`
#ldflags=`pkg-config --libs libSystem gtk+-3.0`
sources=engineering.c
[engineering.c]
@ -39,10 +39,10 @@ cppflags=-I../src/modems
[smscrypt]
type=binary
sources=smscrypt.c
#cflags=`pkg-config --cflags libSystem gtk+-3.0`
cflags=`pkg-config --cflags libSystem gtk+-2.0`
#ldflags=`pkg-config --libs libSystem gtk+-3.0` -lssl
ldflags=`pkg-config --libs libSystem gtk+-2.0` -lssl
#cflags=`pkg-config --cflags libSystem gtk+-3.0`
#ldflags=`pkg-config --libs libSystem gtk+-3.0` -lssl
[smscrypt.c]
depends=../include/Phone.h,../src/plugins/smscrypt.c