projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Don't override user variables within the build system
[lttng-ust.git]
/
doc
/
examples
/
easy-ust
/
Makefile
diff --git
a/doc/examples/easy-ust/Makefile
b/doc/examples/easy-ust/Makefile
index 966c4744bb3c359e100bce061a0e273cb313f986..022729389f4a14fe0e032e99720ba3249d5cc266 100644
(file)
--- a/
doc/examples/easy-ust/Makefile
+++ b/
doc/examples/easy-ust/Makefile
@@
-16,7
+16,6
@@
#
# This makefile is purposefully kept simple to support GNU and BSD make.
#
# This makefile is purposefully kept simple to support GNU and BSD make.
-CC = gcc
LIBS = -ldl -llttng-ust # On Linux
#LIBS = -lc -llttng-ust # On BSD
LOCAL_CPPFLAGS += -I.
LIBS = -ldl -llttng-ust # On Linux
#LIBS = -lc -llttng-ust # On BSD
LOCAL_CPPFLAGS += -I.
@@
-24,16
+23,16
@@
LOCAL_CPPFLAGS += -I.
all: sample
sample: sample.o tp.o
all: sample
sample: sample.o tp.o
- $(CC) -o $@ $(LDFLAGS) $(
CFLAGS) $(AM_LDFLAGS) $(AM_
CFLAGS) \
+ $(CC) -o $@ $(LDFLAGS) $(
AM_CFLAGS) $(AM_LDFLAGS) $(
CFLAGS) \
sample.o tp.o $(LIBS)
sample.o: sample.c sample_component_provider.h
sample.o tp.o $(LIBS)
sample.o: sample.c sample_component_provider.h
- $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS) \
- $(
AM_
CFLAGS) -c -o $@ $<
+ $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(
AM_
CFLAGS) $(AM_CPPFLAGS) \
+ $(CFLAGS) -c -o $@ $<
tp.o: tp.c sample_component_provider.h
tp.o: tp.c sample_component_provider.h
- $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS) \
- $(
AM_
CFLAGS) -c -o $@ $<
+ $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(
AM_
CFLAGS) $(AM_CPPFLAGS) \
+ $(CFLAGS) -c -o $@ $<
html: sample_component_provider.html sample.html tp.html
html: sample_component_provider.html sample.html tp.html
This page took
0.027639 seconds
and
4
git commands to generate.