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)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index cedb90b055e6f73ab8fe96dbd452c42b12f6f076..91710dab6c2b3748b5307f25b31915a8b077bbfd 100644 (file)
--- 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)