projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: build log4j example when enabled
[lttng-ust.git]
/
doc
/
examples
/
Makefile.am
diff --git
a/doc/examples/Makefile.am
b/doc/examples/Makefile.am
index 0d226021adfb32149b93aa2f210304ef049c33a3..9404054d207642ca0dcc054f292c780294ee5b00 100644
(file)
--- a/
doc/examples/Makefile.am
+++ b/
doc/examples/Makefile.am
@@
-8,7
+8,7
@@
doc_examples_demo_tracelogdir = ${docdir}/examples/demo-tracelog
doc_examples_clock_overridedir = ${docdir}/examples/clock-override
doc_examples_getcpu_overridedir = ${docdir}/examples/getcpu-override
doc_examples_clock_overridedir = ${docdir}/examples/clock-override
doc_examples_getcpu_overridedir = ${docdir}/examples/getcpu-override
-if BUILD_JAVA_AGENT
+if BUILD_JAVA_AGENT
_WITH_JUL
doc_examples_java_juldir = ${docdir}/examples/java-jul
dist_doc_examples_java_jul_DATA = java-jul/Makefile \
java-jul/Hello.java \
doc_examples_java_juldir = ${docdir}/examples/java-jul
dist_doc_examples_java_jul_DATA = java-jul/Makefile \
java-jul/Hello.java \
@@
-16,6
+16,14
@@
dist_doc_examples_java_jul_DATA = java-jul/Makefile \
SUBDIRS_JUL = java-jul
endif
SUBDIRS_JUL = java-jul
endif
+if BUILD_JAVA_AGENT_WITH_LOG4J
+doc_examples_java_log4jdir = ${docdir}/examples/java-log4j
+dist_doc_examples_java_log4j_DATA = java-log4j/Makefile \
+ java-log4j/Hello.java \
+ java-log4j/run
+SUBDIRS_LOG4J = java-log4j
+endif
+
dist_doc_examples_DATA = README
dist_doc_examples_easy_ust_DATA = easy-ust/Makefile \
dist_doc_examples_DATA = README
dist_doc_examples_easy_ust_DATA = easy-ust/Makefile \
@@
-74,7
+82,7
@@
endif
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
- for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL); do \
+ for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL)
$(SUBDIRS_LOG4J)
; do \
cp -pfR $(srcdir)/$$subdir $(builddir); \
done; \
fi; \
cp -pfR $(srcdir)/$$subdir $(builddir); \
done; \
fi; \
@@
-99,6
+107,11
@@
all-local:
for subdir in $(SUBDIRS_JUL); do \
(cd $(SUBDIRS_JUL) && $(MAKE) JAVA_CLASSPATH_OVERRIDE="../../../liblttng-ust-java-agent/java" JAVA_JARFILE_OVERRIDE="liblttng-ust-agent.jar" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
done; \
for subdir in $(SUBDIRS_JUL); do \
(cd $(SUBDIRS_JUL) && $(MAKE) JAVA_CLASSPATH_OVERRIDE="../../../liblttng-ust-java-agent/java" JAVA_JARFILE_OVERRIDE="liblttng-ust-agent.jar" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
done; \
+ fi; \
+ if [ x"$(SUBDIRS_LOG4J)" != x"" ]; then \
+ for subdir in $(SUBDIRS_LOG4J); do \
+ (cd $(SUBDIRS_LOG4J) && $(MAKE) JAVA_CLASSPATH_OVERRIDE="../../../liblttng-ust-java-agent/java" JAVA_JARFILE_OVERRIDE="liblttng-ust-agent.jar" $(AM_MAKEFLAGS) all && cd ..) || exit 1; \
+ done; \
fi;
clean-local:
fi;
clean-local:
@@
-114,8
+127,15
@@
clean-local:
fi; \
done; \
fi; \
fi; \
done; \
fi; \
+ if [ x"$(SUBDIRS_LOG4J)" != x"" ]; then \
+ for subdir in $(SUBDIRS_LOG4J); do \
+ if [ -d $$subdir ]; then \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean && cd ..) || exit 1; \
+ fi; \
+ done; \
+ fi; \
if [ x"$(srcdir)" != x"$(builddir)" ]; then \
if [ x"$(srcdir)" != x"$(builddir)" ]; then \
- for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL); do \
+ for subdir in $(SUBDIRS_PROXY) $(SUBDIRS_JUL)
$(SUBDIRS_LOG4J)
; do \
rm -rf $(builddir)/$$subdir; \
done; \
fi;
rm -rf $(builddir)/$$subdir; \
done; \
fi;
This page took
0.025171 seconds
and
4
git commands to generate.