From 09a63accb8863a883ef8aba3a44776ac92ae5764 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 24 Oct 2008 00:06:35 +0200 Subject: [PATCH] Move charset library to top level. --- {source4/lib => lib/util}/charset/charcnv.c | 0 {source4/lib => lib/util}/charset/charset.h | 0 {source4/lib => lib/util}/charset/config.m4 | 0 {source4/lib => lib/util}/charset/config.mk | 0 {source4/lib => lib/util}/charset/iconv.c | 0 {source4/lib => lib/util}/charset/tests/charset.c | 0 {source4/lib => lib/util}/charset/tests/iconv.c | 0 {source4/lib => lib/util}/charset/util_unistr.c | 0 lib/util/util.h | 2 +- librpc/ndr/libndr.h | 2 +- source4/Makefile | 2 +- source4/configure.ac | 2 +- source4/dsdb/schema/schema_syntax.c | 2 +- source4/lib/tdr/tdr.h | 2 +- source4/main.mk | 2 +- source4/torture/local/config.mk | 4 ++-- 16 files changed, 9 insertions(+), 9 deletions(-) rename {source4/lib => lib/util}/charset/charcnv.c (100%) rename {source4/lib => lib/util}/charset/charset.h (100%) rename {source4/lib => lib/util}/charset/config.m4 (100%) rename {source4/lib => lib/util}/charset/config.mk (100%) rename {source4/lib => lib/util}/charset/iconv.c (100%) rename {source4/lib => lib/util}/charset/tests/charset.c (100%) rename {source4/lib => lib/util}/charset/tests/iconv.c (100%) rename {source4/lib => lib/util}/charset/util_unistr.c (100%) diff --git a/source4/lib/charset/charcnv.c b/lib/util/charset/charcnv.c similarity index 100% rename from source4/lib/charset/charcnv.c rename to lib/util/charset/charcnv.c diff --git a/source4/lib/charset/charset.h b/lib/util/charset/charset.h similarity index 100% rename from source4/lib/charset/charset.h rename to lib/util/charset/charset.h diff --git a/source4/lib/charset/config.m4 b/lib/util/charset/config.m4 similarity index 100% rename from source4/lib/charset/config.m4 rename to lib/util/charset/config.m4 diff --git a/source4/lib/charset/config.mk b/lib/util/charset/config.mk similarity index 100% rename from source4/lib/charset/config.mk rename to lib/util/charset/config.mk diff --git a/source4/lib/charset/iconv.c b/lib/util/charset/iconv.c similarity index 100% rename from source4/lib/charset/iconv.c rename to lib/util/charset/iconv.c diff --git a/source4/lib/charset/tests/charset.c b/lib/util/charset/tests/charset.c similarity index 100% rename from source4/lib/charset/tests/charset.c rename to lib/util/charset/tests/charset.c diff --git a/source4/lib/charset/tests/iconv.c b/lib/util/charset/tests/iconv.c similarity index 100% rename from source4/lib/charset/tests/iconv.c rename to lib/util/charset/tests/iconv.c diff --git a/source4/lib/charset/util_unistr.c b/lib/util/charset/util_unistr.c similarity index 100% rename from source4/lib/charset/util_unistr.c rename to lib/util/charset/util_unistr.c diff --git a/lib/util/util.h b/lib/util/util.h index c2407ae9c9f..1cf60bae390 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -22,7 +22,7 @@ #define _SAMBA_UTIL_H_ #if _SAMBA_BUILD_ == 4 -#include "lib/charset/charset.h" +#include "../lib/util/charset/charset.h" #endif #include "../lib/util/attr.h" diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index 05455da0846..127f6734e37 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -29,7 +29,7 @@ #include #if _SAMBA_BUILD_ == 4 #include "../lib/util/util.h" /* for discard_const */ -#include "lib/charset/charset.h" +#include "../lib/util/charset/charset.h" #endif /* diff --git a/source4/Makefile b/source4/Makefile index 26cab668c80..be41d02a384 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -59,7 +59,7 @@ authsrcdir := auth nsswitchsrcdir := nsswitch libsrcdir := lib libsocketsrcdir := lib/socket -libcharsetsrcdir := lib/charset +libcharsetsrcdir := ../lib/util/charset ldb_sambasrcdir := lib/ldb-samba tdbsrcdir := ../lib/tdb ldbsrcdir := lib/ldb diff --git a/source4/configure.ac b/source4/configure.ac index 9d387fcb4c1..cf85b13225d 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -22,7 +22,7 @@ m4_include(../lib/util/xattr.m4) m4_include(../lib/util/capability.m4) m4_include(../lib/util/time.m4) m4_include(../lib/popt/samba.m4) -m4_include(lib/charset/config.m4) +m4_include(../lib/util/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(../lib/zlib/zlib.m4) AC_ZLIB([ diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index 97cd0020a97..b0018c81612 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -25,7 +25,7 @@ #include "librpc/gen_ndr/ndr_drsuapi.h" #include "lib/ldb/include/ldb.h" #include "system/time.h" -#include "lib/charset/charset.h" +#include "../lib/util/charset/charset.h" #include "librpc/ndr/libndr.h" #include "param/param.h" diff --git a/source4/lib/tdr/tdr.h b/source4/lib/tdr/tdr.h index 301cd3002e9..c983cd35c14 100644 --- a/source4/lib/tdr/tdr.h +++ b/source4/lib/tdr/tdr.h @@ -21,7 +21,7 @@ #define __TDR_H__ #include -#include "charset/charset.h" +#include "../lib/util/charset/charset.h" #define TDR_BIG_ENDIAN 0x01 #define TDR_ALIGN2 0x02 diff --git a/source4/main.mk b/source4/main.mk index 8ce86b91ca2..278c38454d5 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -9,7 +9,7 @@ mkinclude auth/config.mk mkinclude nsswitch/config.mk mkinclude lib/samba3/config.mk mkinclude lib/socket/config.mk -mkinclude lib/charset/config.mk +mkinclude ../lib/util/charset/config.mk mkinclude lib/ldb-samba/config.mk mkinclude lib/tls/config.mk mkinclude lib/registry/config.mk diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 9ea212dfa56..def391ba4ee 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -19,7 +19,7 @@ PRIVATE_DEPENDENCIES = \ ################################# TORTURE_LOCAL_OBJ_FILES = \ - $(torturesrcdir)/../lib/charset/tests/iconv.o \ + $(torturesrcdir)/../../lib/util/charset/tests/iconv.o \ $(torturesrcdir)/../../lib/talloc/testsuite.o \ $(torturesrcdir)/../../lib/replace/test/getifaddrs.o \ $(torturesrcdir)/../../lib/replace/test/os2_delete.o \ @@ -39,7 +39,7 @@ TORTURE_LOCAL_OBJ_FILES = \ $(torturesrcdir)/../../lib/util/tests/file.o \ $(torturesrcdir)/../../lib/util/tests/genrand.o \ $(torturesrcdir)/../../lib/compression/testsuite.o \ - $(torturesrcdir)/../lib/charset/tests/charset.o \ + $(torturesrcdir)/../../lib/util/charset/tests/charset.o \ $(torturesrcdir)/../libcli/security/tests/sddl.o \ $(torturesrcdir)/../lib/tdr/testsuite.o \ $(torturesrcdir)/../lib/events/testsuite.o \ -- 2.34.1