diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-04 18:33:52 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-11-04 23:45:42 -0600 |
commit | a62e7733b3e27832c085112f1beda22ee3dd8976 (patch) | |
tree | 9e61e0f0e0a642a2c9f69fe4f18062f455393997 | |
parent | 38a3edb2bea08939234300b53cdf6ab4222847e1 (diff) |
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@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r-- | RepositoryExternal.mk | 2 | ||||
-rw-r--r-- | external/sane/README (renamed from sane/README) | 0 | ||||
-rw-r--r-- | external/sane/inc/sane/sane.h (renamed from sane/inc/sane/sane.h) | 0 | ||||
-rw-r--r-- | external/twain/README (renamed from twain/README) | 0 | ||||
-rw-r--r-- | external/twain/inc/twain/twain.h (renamed from twain/inc/twain/twain.h) | 0 |
5 files changed, 1 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6fa5c82f108e..47dabc199dcc 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 index eda976da10ba..eda976da10ba 100644 --- a/sane/README +++ b/external/sane/README diff --git a/sane/inc/sane/sane.h b/external/sane/inc/sane/sane.h index eb18eef1a601..eb18eef1a601 100644 --- a/sane/inc/sane/sane.h +++ b/external/sane/inc/sane/sane.h diff --git a/twain/README b/external/twain/README index 5d45a5009e98..5d45a5009e98 100644 --- a/twain/README +++ b/external/twain/README diff --git a/twain/inc/twain/twain.h b/external/twain/inc/twain/twain.h index 66927608ba9d..66927608ba9d 100644 --- a/twain/inc/twain/twain.h +++ b/external/twain/inc/twain/twain.h |