[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-110-g481183a
Kai Blin
kai at samba.org
Fri Jan 23 16:58:30 GMT 2009
The branch, master has been updated
via 481183ab025a84dd8d08c1e365251b274597b6c9 (commit)
via 85b36d95fbede3e65cad3bd98d29689de6e13b2e (commit)
from aa2fb0efb7ce2bc732569b4baf20c57375fdce59 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 481183ab025a84dd8d08c1e365251b274597b6c9
Author: Kai Blin <kai at samba.org>
Date: Fri Jan 23 12:25:49 2009 +0100
s4: add ../lib/async_req to the s4 build
commit 85b36d95fbede3e65cad3bd98d29689de6e13b2e
Author: Kai Blin <kai at samba.org>
Date: Fri Jan 23 11:54:30 2009 +0100
async_req: Move to top level dir
-----------------------------------------------------------------------
Summary of changes:
{source3/lib => lib/async_req}/async_req.c | 0
{source3/include => lib/async_req}/async_req.h | 0
lib/async_req/config.mk | 3 +++
source3/Makefile.in | 2 +-
source3/configure.in | 1 +
source4/main.mk | 1 +
6 files changed, 6 insertions(+), 1 deletions(-)
rename {source3/lib => lib/async_req}/async_req.c (100%)
rename {source3/include => lib/async_req}/async_req.h (100%)
create mode 100644 lib/async_req/config.mk
Changeset truncated at 500 lines:
diff --git a/source3/lib/async_req.c b/lib/async_req/async_req.c
similarity index 100%
rename from source3/lib/async_req.c
rename to lib/async_req/async_req.c
diff --git a/source3/include/async_req.h b/lib/async_req/async_req.h
similarity index 100%
rename from source3/include/async_req.h
rename to lib/async_req/async_req.h
diff --git a/lib/async_req/config.mk b/lib/async_req/config.mk
new file mode 100644
index 0000000..08d5288
--- /dev/null
+++ b/lib/async_req/config.mk
@@ -0,0 +1,3 @@
+[SUBSYSTEM::LIBASYNC_REQ]
+
+LIBASYNC_REQ_OBJ_FILES = $(addprefix ../lib/async_req/, async_req.o)
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3cbefc8..cbbf821 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -340,7 +340,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o \
lib/interfaces.o lib/memcache.o \
- lib/util_transfer_file.o lib/async_req.o \
+ lib/util_transfer_file.o ../lib/async_req/async_req.o \
lib/async_sock.o \
$(TDB_LIB_OBJ) \
$(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
diff --git a/source3/configure.in b/source3/configure.in
index 44a932c..88843a4 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -63,6 +63,7 @@ SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/async_req"
SAMBA_CONFIGURE_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt"
diff --git a/source4/main.mk b/source4/main.mk
index df31c90..bfff04d 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -48,3 +48,4 @@ mkinclude libcli/config.mk
mkinclude scripting/python/config.mk
mkinclude kdc/config.mk
mkinclude ../lib/smbconf/config.mk
+mkinclude ../lib/async_req/config.mk
--
Samba Shared Repository
More information about the samba-cvs
mailing list