svn commit: samba r25968 - in branches/SAMBA_4_0/source/lib/ldb: .

metze at samba.org metze at samba.org
Thu Nov 15 13:11:50 GMT 2007


Author: metze
Date: 2007-11-15 13:11:50 +0000 (Thu, 15 Nov 2007)
New Revision: 25968

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

Log:
ldb: we need to use @SONAMEFLAG@ directly so that the '#' trick can work

metze

Modified:
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-15 13:07:08 UTC (rev 25967)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2007-11-15 13:11:50 UTC (rev 25968)
@@ -35,7 +35,6 @@
 LIBDL = @LIBDL@
 
 SHLIBEXT = @SHLIBEXT@
-SONAMEFLAG = @SONAMEFLAG@
 
 LD_EXPORT_DYNAMIC = @LD_EXPORT_DYNAMIC@
 SHLD_FLAGS = @SHLD_FLAGS@
@@ -97,7 +96,7 @@
 STATICLIB = lib/libldb.a
 
 $(SOLIB): $(OBJS)
-	$(CC) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) $(SONAMEFLAG)$(SONAME) 
+	$(CC) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) @SONAMEFLAG@$(SONAME)
 
 all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages
 
@@ -124,7 +123,7 @@
 	@-ranlib $@
 
 lib/libnss_ldb.$(SHLIBEXT).2: $(NSS_OBJ) $(LIBS) bin/libldb.a
-	$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)libnss_ldb.$(SHLIBEXT).2 -o lib/libnss_ldb.$(SHLIBEXT).2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS)
+	$(CC) $(SHLD_FLAGS) -o lib/libnss_ldb.$(SHLIBEXT).2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS) @SONAMEFLAG at libnss_ldb.$(SHLIBEXT).2
 
 sample_module.$(SHLIBEXT): tests/sample_module.o 
 	$(CC) $(SHLD_FLAGS) $(LDFLAGS) -o $@ tests/sample_module.o 



More information about the samba-cvs mailing list