Author: metze Date: 2007-06-04 08:38:33 +0000 (Mon, 04 Jun 2007) New Revision: 23333
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23333 Log: merge from SAMBA_3_0: from logic of using @BUILD_INIPARSER@ metze Modified: branches/SAMBA_3_0_26/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_26/source/Makefile.in =================================================================== --- branches/SAMBA_3_0_26/source/Makefile.in 2007-06-04 08:25:03 UTC (rev 23332) +++ branches/SAMBA_3_0_26/source/Makefile.in 2007-06-04 08:38:33 UTC (rev 23333) @@ -661,7 +661,7 @@ $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \ $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \ - $(LIBGPO_OBJ) $(INIPARSER_OBJ) $(DISPLAY_SEC_OBJ) $(LDB_OBJ) + $(LIBGPO_OBJ) @BUILD_INIPARSER@ $(DISPLAY_SEC_OBJ) $(LDB_OBJ) CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \ $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) @@ -1092,7 +1092,7 @@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TOOL_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) -Lbin -lsmbclient -bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @BUILD_INIPARSER@ +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @INIPARSERLIBS@
