[Libreoffice-commits] core.git: external/sane external/twain RepositoryExternal.mk sane/inc sane/README twain/inc twain/README

[Khaled Hosny]

 RepositoryExternal.mk            |    2 
 external/sane/README             |    1 
 external/sane/inc/sane/sane.h    |  213 +++
 external/twain/README            |    1 
 external/twain/inc/twain/twain.h | 2220 +++++++++++++++++++++++++++++++++++++++
 sane/README                      |    1 
 sane/inc/sane/sane.h             |  213 ---
 twain/README                     |    1 
 twain/inc/twain/twain.h          | 2220 ---------------------------------------
 9 files changed, 2436 insertions(+), 2436 deletions(-)

New commits:
commit a62e7733b3e27832c085112f1beda22ee3dd8976
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Mon Nov 4 18:33:52 2013 +0200

    fdo#70393: move sane and twain to subdirs of external
    
    Change-Id: I0876c3295416abb704ca455bdd61881ff54a0285
    Reviewed-on: https://gerrit.libreoffice.org/6568
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6fa5c82..47dabc1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -162,7 +162,7 @@ ifeq (SANE,$(filter SANE,$(BUILD_TYPE)))
 
 define gb_LinkTarget__use_sane_headers
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(SRCDIR)/$(if $(filter WNT,$(OS)),twain,sane)/inc \
+	-I$(SRCDIR)/external/$(if $(filter WNT,$(OS)),twain,sane)/inc \
 	$$(INCLUDE) \
 )
 
diff --git a/sane/README b/external/sane/README
similarity index 100%
rename from sane/README
rename to external/sane/README
diff --git a/sane/inc/sane/sane.h b/external/sane/inc/sane/sane.h
similarity index 100%
rename from sane/inc/sane/sane.h
rename to external/sane/inc/sane/sane.h
diff --git a/twain/README b/external/twain/README
similarity index 100%
rename from twain/README
rename to external/twain/README
diff --git a/twain/inc/twain/twain.h b/external/twain/inc/twain/twain.h
similarity index 100%
rename from twain/inc/twain/twain.h
rename to external/twain/inc/twain/twain.h