You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/07/29 01:40:27 UTC
[49/62] [abbrv] trafficserver git commit: TS-3030 Remove the Makefile
targets / ops
TS-3030 Remove the Makefile targets / ops
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a43a1249
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a43a1249
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a43a1249
Branch: refs/heads/6.0.x
Commit: a43a1249cc26074238c3b94f623d690181d99176
Parents: 3678a6e
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Jul 24 09:45:23 2015 +0200
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Jul 24 09:45:29 2015 +0200
----------------------------------------------------------------------
Makefile.am | 7 +------
lib/Makefile.am | 1 -
2 files changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a43a1249/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 078cfc1..2b6cbdd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,6 @@ asf-dist-rc: asf-distdir
asf-distdir:
@$(am__remove_distdir)
test -d .git && git clone . $(distdir)
- cd $(distdir) && git submodule update --init && autoreconf -i
$(RM) -r -- $(distdir)/autom4te.cache $(distdir)/ci `find $(distdir) -name .git -o -name .gitignore -o -name .gitmodules`
asf-dist-sign: asf-dist
@@ -99,9 +98,6 @@ install-data-hook:
rat:
java -jar $(top_srcdir)/ci/apache-rat-0.11-SNAPSHOT.jar -E $(top_srcdir)/ci/rat-regex.txt -d $(top_srcdir)
-submodules:
- git submodule update --init
-
clang-format:
for f in `find $(top_srcdir) -iname \*.[ch] -o -iname \*.cc | fgrep -v -e lib/luajit -e lib/tsconfig`; do \
echo $$f; clang-format -i $$f; done
@@ -119,9 +115,8 @@ help:
echo 'rel-candidate recreate a signed relelease candidate source package and a signed git tag' && \
echo 'distcheck verify dist by performing VPATH build and then distclean' && \
echo 'rat produce a RAT licence compliance report of the source' && \
- echo 'submodules update the git submodules' && \
echo 'doxygen generate doxygen docs in doc/html dir' && \
- echo 'clang-format run clang-format over most C and C++ files (not git submodules/trees)' && \
+ echo 'clang-format run clang-format over most C and C++ files (not git subtrees)' && \
echo 'help display this list of make targets' && \
echo 'install install by copying the built files to system-wide dirs' && \
echo 'install-strip same as install but then strips debugging symbols' && \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a43a1249/lib/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 43c0134..6f3bf23 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -45,7 +45,6 @@ LUA_CFLAGS=$(CFLAGS) $(LUAJIT_CFLAGS) -DLUA_COMPAT_ALL -DLUA_USE_POSIX -DLUA_USE
all-local:
@echo "Making all in luajit"
- test -d "$(top_srcdir)/$(subdir)/luajit/src" || (cd "$(top_srcdir)" && git submodule update --init)
test -d "$(top_builddir)/$(subdir)/luajit/src" || cp -rf "$(srcdir)/luajit" "$(top_builddir)/$(subdir)/"
cd luajit && $(MAKE) $(AM_MAKEFLAGS) BUILDMODE="static" PREFIX="$(prefix)" CC="$(CC)" \
CFLAGS="$(LUA_CFLAGS)" LDFLAGS="@LUA_LDFLAGS@"