Merge changes I795ea4d7,I4871ee62

[platform/upstream/dbus.git] / samsung_tools / Makefile

diff --git a/samsung_tools/Makefile b/samsung_tools/Makefile
index 1fc6174..971e010 100644 (file)
--- a/samsung_tools/Makefile
+++ b/samsung_tools/Makefile
@@ -1,22 +1,40 @@
+#CROSS_COMPILE = arm-linux-gnueabi-
+CC            = $(CROSS_COMPILE)gcc
+
 SERVER_DBUS_SOURCES=serwer.c
 
 CLIENT_DBUS_SOURCES=client.c
 
-SQLITE_CFLAGS=`pkg-config --cflags sqlite3`
-SQLITE_LIBS=`pkg-config --libs sqlite3`
+#SQLITE_CFLAGS=`pkg-config --cflags sqlite3`
+#SQLITE_LIBS=`pkg-config --libs sqlite3`
 
-DBUS_CFLAGS=`pkg-config --cflags dbus-1`
-DBUS_LIBS=`pkg-config --libs dbus-1`
+ifndef CROSS_COMPILE
+DBUS_CFLAGS=-I../
+DBUS_LIBS=-L../dbus/.libs/ -ldbus-1
+else
+DBUS_CFLAGS=-I/home/`whoami`/GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0/.build.packages/BUILD/com.samsung.dbus-1.7.5
+DBUS_LIBS=-L/home/`whoami`/GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0/.build.packages/BUILD/com.samsung.dbus-1.7.5/dbus/.libs -ldbus-1
+endif
 
 INCLUDES=-Wall -g -O0
 
-all: ping-server ping-client 
+SUBDIRS = test_foxp_latency
+
+.PHONY: test_foxp_latency all
+
+all: ping-server ping-client test_foxp_latency
 
-ping-server: 
-       gcc -o $@ $(SERVER_DBUS_SOURCES) $(INCLUDES) $(DBUS_CFLAGS) $(CFLAGS) $(DBUS_LIBS) $(SQLITE_CFLAGS) $(SQLITE_LIBS)
+test_foxp_latency:
+       $(MAKE) -C $@
+
+ping-server:
+       $(CC) -o $@ $(SERVER_DBUS_SOURCES) $(INCLUDES) $(DBUS_CFLAGS) $(CFLAGS) $(DBUS_LIBS) $(SQLITE_CFLAGS) $(SQLITE_LIBS)
 
 ping-client: 
-       gcc -o $@ $(CLIENT_DBUS_SOURCES) $(INCLUDES) $(DBUS_CFLAGS) $(CFLAGS) $(DBUS_LIBS) $(SQLITE_CFLAGS) $(SQLITE_LIBS) 
+       $(CC) -o $@ $(CLIENT_DBUS_SOURCES) $(INCLUDES) $(DBUS_CFLAGS) $(CFLAGS) $(DBUS_LIBS) $(SQLITE_CFLAGS) $(SQLITE_LIBS) 
+
+install:
+
 
 clean:
-       rm -f *.o ping-server ping-client
+       rm -f *.o ping-server ping-client
\ No newline at end of file