svn commit: samba r22130 - in branches/SAMBA_3_0/examples/libsmbclient: .

derrell at samba.org derrell at samba.org
Sun Apr 8 16:41:25 GMT 2007


Author: derrell
Date: 2007-04-08 16:41:24 +0000 (Sun, 08 Apr 2007)
New Revision: 22130

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

Log:

- Ensure that the libsmbclient example programs link with the libsmbclient
  library that's part of the current tree, not with whatever happens to have
  been previously installed.

Modified:
   branches/SAMBA_3_0/examples/libsmbclient/Makefile


Changeset:
Modified: branches/SAMBA_3_0/examples/libsmbclient/Makefile
===================================================================
--- branches/SAMBA_3_0/examples/libsmbclient/Makefile	2007-04-08 04:54:44 UTC (rev 22129)
+++ branches/SAMBA_3_0/examples/libsmbclient/Makefile	2007-04-08 16:41:24 UTC (rev 22130)
@@ -11,7 +11,8 @@
 CFLAGS = -O0 -g -I$(SAMBA_INCL) $(EXTLIB_INCL) $(DEFS)
 
 LDFLAGS = -L/usr/local/samba/lib
-LIBSMBCLIENT = /usr/local/samba/lib/libsmbclient.so
+#LIBSMBCLIENT = /usr/local/samba/lib/libsmbclient.so
+LIBSMBCLIENT = ../../source/bin/libsmbclient.a -ldl -lresolv
 
 TESTS=	testsmbc \
 	tree \
@@ -32,39 +33,39 @@
 
 tree: tree.o
 	@echo Linking tree
-	@$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` $(LIBSMBCLIENT) $<
+	$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ $< `gtk-config --libs` $(LIBSMBCLIENT)
 
 testacl: testacl.o
 	@echo Linking testacl
-	@$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` $(LIBSMBCLIENT) -lpopt $<
+	$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ $< `gtk-config --libs` $(LIBSMBCLIENT) -lpopt
 
 testbrowse: testbrowse.o
 	@echo Linking testbrowse
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
 
 testbrowse2: testbrowse2.o
 	@echo Linking testbrowse2
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
 
 teststat: teststat.o
 	@echo Linking teststat
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
 
 teststat2: teststat2.o
 	@echo Linking teststat2
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
 
 testchmod: testchmod.o
 	@echo Linking testchmod
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
 
 testutime: testutime.o
 	@echo Linking testutime
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
 
 testread: testread.o
 	@echo Linking testread
-	@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT) -lpopt
 
 smbsh:
 	make -C smbwrapper



More information about the samba-cvs mailing list