sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Move charset library to top level.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-10-24 00:06:35 +02:00
parent 8baf169549
commit 09a63accb8
16 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
source4/lib/charset/charcnv.c → lib/util/charset/charcnv.c
View File

0
source4/lib/charset/charset.h → lib/util/charset/charset.h
View File

0
source4/lib/charset/config.m4 → lib/util/charset/config.m4
View File

0
source4/lib/charset/config.mk → lib/util/charset/config.mk
View File

0
source4/lib/charset/iconv.c → lib/util/charset/iconv.c
View File

0
source4/lib/charset/tests/charset.c → lib/util/charset/tests/charset.c
View File

0
source4/lib/charset/tests/iconv.c → lib/util/charset/tests/iconv.c
View File

0
source4/lib/charset/util_unistr.c → lib/util/charset/util_unistr.c
View File

2
lib/util/util.h
View File

@ -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"

2
librpc/ndr/libndr.h
View File

@ -29,7 +29,7 @@
#include <sys/time.h>
#if _SAMBA_BUILD_ == 4
#include "../lib/util/util.h" /* for discard_const */
#include "lib/charset/charset.h"
#include "../lib/util/charset/charset.h"
#endif
/*

2
source4/Makefile
View File

@ -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

2
source4/configure.ac
View File

@ -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([

2
source4/dsdb/schema/schema_syntax.c
View File

@ -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"

2
source4/lib/tdr/tdr.h
View File

@ -21,7 +21,7 @@
#define __TDR_H__
#include <talloc.h>
#include "charset/charset.h"
#include "../lib/util/charset/charset.h"
#define TDR_BIG_ENDIAN 0x01
#define TDR_ALIGN2 0x02

2
source4/main.mk
View File

@ -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

4
source4/torture/local/config.mk
View File

@ -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 \