[Pcsclite-git-commit] [CCID] 01/01: Use git submodules for PCSC and contrib

Ludovic Rousseau rousseau at moszumanska.debian.org
Sun May 10 15:24:55 UTC 2015 

This is an automated email from the git hooks/post-receive script.

rousseau pushed a commit to branch master
in repository CCID.

commit 28a44ae58b5adc1508b78de58686aa64cb4e1f17
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Sun May 10 17:22:04 2015 +0200

    Use git submodules for PCSC and contrib
    
    PCSC is a relative submodule to ../PCSC.git
    
    contrib_libPCSCv2part10 is a relative submodule to ../contrib.git
    I had to rename the directory to avoid a name clash with an already
    existing contrib/ directory.
    
    Thanks to Martin Paljak for the idea
    https://github.com/LudovicRousseau/CCID/issues/3
---
 .gitmodules             | 6 ++++++
 MacOSX/debuglog.h       | 2 +-
 MacOSX/ifdhandler.h     | 2 +-
 MacOSX/reader.h         | 2 +-
 PCSC                    | 1 +
 contrib_libPCSCv2part10 | 1 +
 examples/PCSCv2part10.c | 2 +-
 examples/PCSCv2part10.h | 2 +-
 m4/as-ac-expand.m4      | 2 +-
 m4/ax_pthread.m4        | 2 +-
 src/misc.h              | 2 +-
 src/parser.h            | 2 +-
 src/simclist.c          | 2 +-
 src/simclist.h          | 2 +-
 src/strlcpy.c           | 2 +-
 src/strlcpycat.h        | 2 +-
 src/tokenparser.l       | 2 +-
 17 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..eb6fc7d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "PCSC"]
+	path = PCSC
+	url = ../PCSC.git
+[submodule "contrib_libPCSCv2part10"]
+	path = contrib_libPCSCv2part10
+	url = ../contrib.git
diff --git a/MacOSX/debuglog.h b/MacOSX/debuglog.h
index a390616..3cf8f38 120000
--- a/MacOSX/debuglog.h
+++ b/MacOSX/debuglog.h
@@ -1 +1 @@
-../../PCSC/src/PCSC/debuglog.h
\ No newline at end of file
+../PCSC/src/PCSC/debuglog.h
\ No newline at end of file
diff --git a/MacOSX/ifdhandler.h b/MacOSX/ifdhandler.h
index 0b77d14..9c8e994 120000
--- a/MacOSX/ifdhandler.h
+++ b/MacOSX/ifdhandler.h
@@ -1 +1 @@
-../../PCSC/src/PCSC/ifdhandler.h
\ No newline at end of file
+../PCSC/src/PCSC/ifdhandler.h
\ No newline at end of file
diff --git a/MacOSX/reader.h b/MacOSX/reader.h
index 76c6585..790c7c4 120000
--- a/MacOSX/reader.h
+++ b/MacOSX/reader.h
@@ -1 +1 @@
-../../PCSC/src/PCSC/reader.h
\ No newline at end of file
+../PCSC/src/PCSC/reader.h
\ No newline at end of file
diff --git a/PCSC b/PCSC
new file mode 160000
index 0000000..ef0bec5
--- /dev/null
+++ b/PCSC
@@ -0,0 +1 @@
+Subproject commit ef0bec5ddd3ecdd758b28ce4d2a13e5a6b01e969
diff --git a/contrib_libPCSCv2part10 b/contrib_libPCSCv2part10
new file mode 160000
index 0000000..6f2fa69
--- /dev/null
+++ b/contrib_libPCSCv2part10
@@ -0,0 +1 @@
+Subproject commit 6f2fa6943d0364f0d364ed5689dc6479fac30e11
diff --git a/examples/PCSCv2part10.c b/examples/PCSCv2part10.c
index 50c4805..3e59243 120000
--- a/examples/PCSCv2part10.c
+++ b/examples/PCSCv2part10.c
@@ -1 +1 @@
-../../contrib/libPCSCv2part10/PCSCv2part10.c
\ No newline at end of file
+../contrib_libPCSCv2part10/libPCSCv2part10/PCSCv2part10.c
\ No newline at end of file
diff --git a/examples/PCSCv2part10.h b/examples/PCSCv2part10.h
index 126c078..8b8311b 120000
--- a/examples/PCSCv2part10.h
+++ b/examples/PCSCv2part10.h
@@ -1 +1 @@
-../../contrib/libPCSCv2part10/PCSCv2part10.h
\ No newline at end of file
+../contrib_libPCSCv2part10/libPCSCv2part10/PCSCv2part10.h
\ No newline at end of file
diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4
index f758055..ee8eb43 120000
--- a/m4/as-ac-expand.m4
+++ b/m4/as-ac-expand.m4
@@ -1 +1 @@
-../../PCSC/m4/as-ac-expand.m4
\ No newline at end of file
+../PCSC/m4/as-ac-expand.m4
\ No newline at end of file
diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
index 66e69ef..340c07d 120000
--- a/m4/ax_pthread.m4
+++ b/m4/ax_pthread.m4
@@ -1 +1 @@
-../../PCSC/m4/ax_pthread.m4
\ No newline at end of file
+../PCSC/m4/ax_pthread.m4
\ No newline at end of file
diff --git a/src/misc.h b/src/misc.h
index 6b8d8b3..b47f6b0 120000
--- a/src/misc.h
+++ b/src/misc.h
@@ -1 +1 @@
-../../PCSC/src/misc.h
\ No newline at end of file
+../PCSC/src/misc.h
\ No newline at end of file
diff --git a/src/parser.h b/src/parser.h
index 5d3cd48..00feb5b 120000
--- a/src/parser.h
+++ b/src/parser.h
@@ -1 +1 @@
-../../PCSC/src/parser.h
\ No newline at end of file
+../PCSC/src/parser.h
\ No newline at end of file
diff --git a/src/simclist.c b/src/simclist.c
index 972b70d..40933f2 120000
--- a/src/simclist.c
+++ b/src/simclist.c
@@ -1 +1 @@
-../../PCSC/src/simclist.c
\ No newline at end of file
+../PCSC/src/simclist.c
\ No newline at end of file
diff --git a/src/simclist.h b/src/simclist.h
index 3e1b91c..8a44093 120000
--- a/src/simclist.h
+++ b/src/simclist.h
@@ -1 +1 @@
-../../PCSC/src/simclist.h
\ No newline at end of file
+../PCSC/src/simclist.h
\ No newline at end of file
diff --git a/src/strlcpy.c b/src/strlcpy.c
index ea395b6..bde77fc 120000
--- a/src/strlcpy.c
+++ b/src/strlcpy.c
@@ -1 +1 @@
-../../PCSC/src/strlcpy.c
\ No newline at end of file
+../PCSC/src/strlcpy.c
\ No newline at end of file
diff --git a/src/strlcpycat.h b/src/strlcpycat.h
index 3505f3c..c240eca 120000
--- a/src/strlcpycat.h
+++ b/src/strlcpycat.h
@@ -1 +1 @@
-../../PCSC/src/strlcpycat.h
\ No newline at end of file
+../PCSC/src/strlcpycat.h
\ No newline at end of file
diff --git a/src/tokenparser.l b/src/tokenparser.l
index f60f427..a703db9 120000
--- a/src/tokenparser.l
+++ b/src/tokenparser.l
@@ -1 +1 @@
-../../PCSC/src/tokenparser.l
\ No newline at end of file
+../PCSC/src/tokenparser.l
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/CCID.git

More information about the Pcsclite-cvs-commit mailing list