X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=doc%2Fexamples%2Feasy-ust%2FMakefile;h=e3546e11a63c3675e35c2edb78d308aeaba085fe;hb=2e3906003540b455b473ce06fdde4ba38208e4b0;hp=e20e53a959074da42c701a1b497f39bd5b6a3bf3;hpb=46d522007b647e0b64d18d0ed518205c2bbad424;p=lttng-ust.git diff --git a/doc/examples/easy-ust/Makefile b/doc/examples/easy-ust/Makefile index e20e53a9..e3546e11 100644 --- 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 -CFLAGS += -I. +LOCAL_CPPFLAGS += -I. # Only necessary when building from the source tree and lttng-ust is not # installed ifdef BUILD_EXAMPLES_FROM_TREE -CFLAGS += -I../../../include/ +LOCAL_CPPFLAGS += -I../../../include/ 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 @@ -42,10 +42,10 @@ sample: sample.o tp.o $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) sample.o: sample.c sample_component_provider.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) -c -o $@ $< tp.o: tp.c sample_component_provider.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + $(CC) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(CFLAGS) -c -o $@ $< html: sample_component_provider.html sample.html tp.html