Introduce vcs-svn lib
Teach the build system to build a separate library for the upcoming subversion interop support. The resulting vcs-svn/lib.a does not contain any code, nor is it built during a normal build. This is just scaffolding for later changes. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Aug 9, 2010 at 17:04 UTC
3f527372d9ec6d7b6890773e41c4b3542d7ad451
2 files changed
+33
-1
Makefile
+7
-1
@@ -468,6 +468,7 @@ export PYTHON_PATH
468
469
LIB_FILE=libgit.a
470
XDIFF_LIB=xdiff/lib.a
471
+VCSSVN_LIB=vcs-svn/lib.a
472
473
LIB_H += advice.h
474
LIB_H += archive.h
@@ -1739,7 +1740,8 @@ ifndef NO_CURL
1740
endif
1741
XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
1742
xdiff/xmerge.o xdiff/xpatience.o
1742
-OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS)
1743
+VCSSVN_OBJS =
1744
+OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)
1745
1746
dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
1747
dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
@@ -1861,6 +1863,8 @@ http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h
1863
xdiff-interface.o $(XDIFF_OBJS): \
1864
xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
1865
xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
1866
+
1867
+$(VCSSVN_OBJS):
1868
endif
1869
1870
exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
@@ -1909,6 +1913,8 @@ $(LIB_FILE): $(LIB_OBJS)
1913
$(XDIFF_LIB): $(XDIFF_OBJS)
1914
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
1915
1916
+$(VCSSVN_LIB): $(VCSSVN_OBJS)
1917
+ $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
1918
1919
doc:
1920
$(MAKE) -C Documentation all
vcs-svn/LICENSE
new
+26
@@ -0,0 +1,26 @@
1
+Copyright (C) 2010 David Barr <david.barr@cordelta.com>.
2
+All rights reserved.
3
+
4
+Redistribution and use in source and binary forms, with or without
5
+modification, are permitted provided that the following conditions
6
+are met:
7
+1. Redistributions of source code must retain the above copyright
8
+ notice(s), this list of conditions and the following disclaimer
9
+ unmodified other than the allowable addition of one or more
10
+ copyright notices.
11
+2. Redistributions in binary form must reproduce the above copyright
12
+ notice(s), this list of conditions and the following disclaimer in
13
+ the documentation and/or other materials provided with the
14
+ distribution.
15
+
16
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
17
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
19
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
20
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
23
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
25
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
26
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.