projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move include directive from CFLAGS to LOCAL_CPPFLAGS in examples' Makefiles
[lttng-ust.git]
/
doc
/
examples
/
easy-ust
/
Makefile
diff --git
a/doc/examples/easy-ust/Makefile
b/doc/examples/easy-ust/Makefile
index 304632bb3f37fff275173449998a169d1b5d7244..e3546e11a63c3675e35c2edb78d308aeaba085fe 100644
(file)
--- a/
doc/examples/easy-ust/Makefile
+++ b/
doc/examples/easy-ust/Makefile
@@
-17,14
+17,14
@@
CC = gcc
LIBS = -ldl -llttng-ust # On Linux
#LIBS = -lc -llttng-ust # On BSD
CC = gcc
LIBS = -ldl -llttng-ust # On Linux
#LIBS = -lc -llttng-ust # On BSD
-
C
FLAGS += -I.
+
LOCAL_CPP
FLAGS += -I.
# Only necessary when building from the source tree and lttng-ust is not
# installed
ifdef BUILD_EXAMPLES_FROM_TREE
# Only necessary when building from the source tree and lttng-ust is not
# installed
ifdef BUILD_EXAMPLES_FROM_TREE
-
C
FLAGS += -I../../../include/
+
LOCAL_CPP
FLAGS += -I../../../include/
LIBLTTNG_UST_PATH = ../../../liblttng-ust/.libs/
LIBLTTNG_UST_PATH = ../../../liblttng-ust/.libs/
-LDFLAGS += -L$(LIBLTTNG_UST_PATH) -Wl,-rpath='$$ORIGIN/$(LIBLTTNG_UST_PATH)'
+
override
LDFLAGS += -L$(LIBLTTNG_UST_PATH) -Wl,-rpath='$$ORIGIN/$(LIBLTTNG_UST_PATH)'
# Third-party Makefiles have to define these targets to integrate with an
# automake project
# Third-party Makefiles have to define these targets to integrate with an
# automake project
@@
-42,10
+42,10
@@
sample: sample.o tp.o
$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
sample.o: sample.c sample_component_provider.h
$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
sample.o: sample.c sample_component_provider.h
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(C
PPFLAGS) $(LOCAL_CPPFLAGS) $(C
FLAGS) -c -o $@ $<
tp.o: tp.c sample_component_provider.h
tp.o: tp.c sample_component_provider.h
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(C
PPFLAGS) $(LOCAL_CPPFLAGS) $(C
FLAGS) -c -o $@ $<
html: sample_component_provider.html sample.html tp.html
html: sample_component_provider.html sample.html tp.html
This page took
0.023638 seconds
and
4
git commands to generate.