svn commit: samba r9636 - branches/SAMBA_3_0/source trunk/source

jpeach at samba.org jpeach at samba.org
Fri Aug 26 06:12:53 GMT 2005


Author: jpeach
Date: 2005-08-26 06:12:52 +0000 (Fri, 26 Aug 2005)
New Revision: 9636

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9636

Log:
The new profiles code needs all the dummy objects to link.

Modified:
   branches/SAMBA_3_0/source/Makefile.in
   trunk/source/Makefile.in


Changeset:
Modified: branches/SAMBA_3_0/source/Makefile.in
===================================================================
--- branches/SAMBA_3_0/source/Makefile.in	2005-08-26 05:25:29 UTC (rev 9635)
+++ branches/SAMBA_3_0/source/Makefile.in	2005-08-26 06:12:52 UTC (rev 9636)
@@ -202,7 +202,8 @@
 	  lib/module.o lib/ldap_escape.o @CHARSET_STATIC@ \
 	  lib/privileges.o lib/secdesc.o lib/secace.o lib/secacl.o @SOCKWRAP@
 
-LIB_NONSMBD_OBJ = $(LIB_OBJ) lib/dummysmbd.o lib/dummyroot.o
+LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyroot.o
+LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ)
 
 READLINE_OBJ = lib/readline.o
 
@@ -328,10 +329,10 @@
 GROUPDB_OBJ = groupdb/mapping.o
 
 PROFILE_OBJ = profile/profile.o
-PROFILES_OBJ = utils/profiles.o lib/dummysmbd.o \
+PROFILES_OBJ = utils/profiles.o \
                $(REGFIO_OBJ) $(REGOBJS_OBJ) $(ERRORMAP_OBJ) \
-               $(LIB_OBJ) $(RPC_PARSE_OBJ1) $(PARAM_OBJ) $(LIBSAMBA_OBJ) \
-               $(DOSERR_OBJ)
+	       $(RPC_PARSE_OBJ1) $(PARAM_OBJ) $(LIBSAMBA_OBJ) \
+               $(DOSERR_OBJ) $(LIB_OBJ) $(LIB_DUMMY_OBJ)
 
 OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o
 

Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in	2005-08-26 05:25:29 UTC (rev 9635)
+++ trunk/source/Makefile.in	2005-08-26 06:12:52 UTC (rev 9636)
@@ -204,7 +204,8 @@
 	  lib/module.o lib/ldap_escape.o @CHARSET_STATIC@ \
 	  lib/secdesc.o lib/secace.o lib/secacl.o @SOCKWRAP@
 
-LIB_NONSMBD_OBJ = $(LIB_OBJ) lib/dummysmbd.o lib/dummyroot.o
+LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyroot.o
+LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ)
 
 READLINE_OBJ = lib/readline.o
 



More information about the samba-cvs mailing list