diff options
| author | Michael Adam <obnox@samba.org> | 2008-05-24 01:51:07 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-05-24 01:51:07 +0200 |
| commit | c5d3fb706242d58230ba3c7aa98f8548e0205148 (patch) | |
| tree | 7ca6c3fb04ada032e8ee410a709b92d5d1c99090 | |
| parent | 06481e72f222345f6f3925ddfc24d6d43c7fb1f5 (diff) | |
| download | samba-c5d3fb706242d58230ba3c7aa98f8548e0205148.tar.gz samba-c5d3fb706242d58230ba3c7aa98f8548e0205148.tar.bz2 samba-c5d3fb706242d58230ba3c7aa98f8548e0205148.zip | |
build: combine LIB_WITHOUT_PROTO_OBJ and LIB_WITH_PROTO_OBJ into LIB_OBJ
No need for this split any more.
Michael
(This used to be commit 534e87de2eed10db0c8fc5dd8ab7dd2621b09408)
| -rw-r--r-- | source3/Makefile.in | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index cedb90b055..91710dab6c 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -338,14 +338,13 @@ LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \ $(SOCKET_WRAPPER_OBJ) \ $(NSS_WRAPPER_OBJ) -LIB_WITHOUT_PROTO_OBJ = $(LIBSAMBAUTIL_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/talloc_stack.o \ - lib/interfaces.o lib/rbtree.o lib/memcache.o \ - lib/util_transfer_file.o lib/async_req.o \ - $(TDB_OBJ) - -LIB_WITH_PROTO_OBJ = $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \ +LIB_OBJ = $(LIBSAMBAUTIL_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/talloc_stack.o \ + lib/interfaces.o lib/rbtree.o lib/memcache.o \ + lib/util_transfer_file.o lib/async_req.o \ + $(TDB_OBJ) \ + $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \ lib/interface.o lib/md4.o \ lib/pidfile.o \ lib/signal.o lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \ @@ -367,8 +366,6 @@ LIB_WITH_PROTO_OBJ = $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \ libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \ lib/file_id.o -LIB_OBJ = $(LIB_WITHOUT_PROTO_OBJ) $(LIB_WITH_PROTO_OBJ) - LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyroot.o LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ) |