summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Eljasiewicz <m.eljasiewic@samsung.com>2013-11-28 10:28:39 +0100
committerLubomir Rintel <lkundrak@v3.sk>2015-02-11 11:55:10 +0100
commit217020e782a3a34989067f7ef47b7bea5ccb445d (patch)
tree1acffb1b79c203141fdf601fb38adb950ff529f1
parent2a5cf78e818071512ea6ad35a629d19c447588e8 (diff)
[Makefile] Added samsung_tools building from root dir
Change-Id: I9bf0d78a069052827334a5c03d1ca7e232f8fa5c
-rw-r--r--Makefile.am2
-rw-r--r--samsung_tools/Makefile18
2 files changed, 13 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 756ab8b9..253564c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=dbus bus tools test doc
+SUBDIRS=dbus bus tools test doc samsung_tools
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dbus-1.pc
diff --git a/samsung_tools/Makefile b/samsung_tools/Makefile
index 704e596e..00cefc35 100644
--- a/samsung_tools/Makefile
+++ b/samsung_tools/Makefile
@@ -12,20 +12,26 @@ ifndef CROSS_COMPILE
DBUS_CFLAGS=`pkg-config --cflags dbus-1`
DBUS_LIBS=`pkg-config --libs dbus-1`
else
-DBUS_CFLAGS=-I/home/r.pajak/GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0/.build.packages/BUILD/com.samsung.dbus-1.7.5
-DBUS_LIBS=-L/home/r.pajak/GBS-ROOT/local/BUILD-ROOTS/scratch.armv7l.0/.build.packages/BUILD/com.samsung.dbus-1.7.5/dbus/.libs -ldbus-1
+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
-ping-server:
+.PHONY: test_foxp_latency all
+
+all: ping-server ping-client test_foxp_latency
+
+test_foxp_latency:
+ $(MAKE) -C $@
+
+ping-server:
$(CC) -o $@ $(SERVER_DBUS_SOURCES) $(INCLUDES) $(DBUS_CFLAGS) $(CFLAGS) $(DBUS_LIBS) $(SQLITE_CFLAGS) $(SQLITE_LIBS)
ping-client:
$(CC) -o $@ $(CLIENT_DBUS_SOURCES) $(INCLUDES) $(DBUS_CFLAGS) $(CFLAGS) $(DBUS_LIBS) $(SQLITE_CFLAGS) $(SQLITE_LIBS)
clean:
- rm -f *.o ping-server ping-client
-
+ rm -f *.o ping-server ping-client \ No newline at end of file