svn commit: samba r5112 - branches/SAMBA_3_0/examples/auth branches/SAMBA_3_0/examples/pdb trunk/examples/auth trunk/examples/pdb

[tpot at samba.org]

Author: tpot
Date: 2005-01-30 22:47:26 +0000 (Sun, 30 Jan 2005)
New Revision: 5112

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

Log:
Fix for shared object creation in examples.  Bugzilla #2058.

Modified:
   branches/SAMBA_3_0/examples/auth/Makefile
   branches/SAMBA_3_0/examples/pdb/Makefile
   trunk/examples/auth/Makefile
   trunk/examples/pdb/Makefile


Changeset:
Modified: branches/SAMBA_3_0/examples/auth/Makefile
===================================================================
--- branches/SAMBA_3_0/examples/auth/Makefile	2005-01-30 22:45:46 UTC (rev 5111)
+++ branches/SAMBA_3_0/examples/auth/Makefile	2005-01-30 22:47:26 UTC (rev 5112)
@@ -9,7 +9,7 @@
 UBIQX_SRC = ../../source/ubiqx
 SMBWR_SRC = ../../source/smbwrapper
 CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
-AUTH_OBJS = auth_skel.so
+AUTH_OBJS = auth_skel.la
 
 # Default target
 
@@ -17,8 +17,8 @@
 
 # Pattern rules
 
-%.so: %.lo
-	$(LIBTOOL) --mode=link $(CC) -shared -o $@ $< $(LDFLAGS)
+%.la: %.lo
+	$(LIBTOOL) --mode=link $(CC) -module -o $@ $< $(LDFLAGS)
 
 %.lo: %.c
 	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
@@ -28,4 +28,4 @@
 clean:
 	rm -rf .libs
 	rm -f core *~ *% *.bak \
-		$(AUTH_OBJS) $(AUTH_OBJS:.so=.o) $(AUTH_OBJS:.so=.lo) 
+		$(AUTH_OBJS) $(AUTH_OBJS:.la=.o) $(AUTH_OBJS:.la=.lo) 

Modified: branches/SAMBA_3_0/examples/pdb/Makefile
===================================================================
--- branches/SAMBA_3_0/examples/pdb/Makefile	2005-01-30 22:45:46 UTC (rev 5111)
+++ branches/SAMBA_3_0/examples/pdb/Makefile	2005-01-30 22:47:26 UTC (rev 5112)
@@ -9,7 +9,7 @@
 UBIQX_SRC = ../../source/ubiqx
 SMBWR_SRC = ../../source/smbwrapper
 CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -I/usr/include/heimdal -fPIC
-PDB_OBJS = test.so
+PDB_OBJS = test.la
 
 # Default target
 
@@ -17,8 +17,8 @@
 
 # Pattern rules
 
-%.so: %.lo
-	$(LIBTOOL) --mode=link $(CC) -shared -o $@ $< $(LDFLAGS)
+%.la: %.lo
+	$(LIBTOOL) --mode=link $(CC) -module -o $@ $< $(LDFLAGS) -rpath /usr/lib/samba/pdb/
 
 %.lo: %.c
 	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
@@ -28,4 +28,4 @@
 clean:
 	rm -rf .libs
 	rm -f core *~ *% *.bak \
-		$(PDB_OBJS) $(PDB_OBJS:.so=.o) $(PDB_OBJS:.so=.lo) 
+		$(PDB_OBJS) $(PDB_OBJS:.la=.o) $(PDB_OBJS:.la=.lo) 

Modified: trunk/examples/auth/Makefile
===================================================================
--- trunk/examples/auth/Makefile	2005-01-30 22:45:46 UTC (rev 5111)
+++ trunk/examples/auth/Makefile	2005-01-30 22:47:26 UTC (rev 5112)
@@ -9,7 +9,7 @@
 UBIQX_SRC = ../../source/ubiqx
 SMBWR_SRC = ../../source/smbwrapper
 CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
-AUTH_OBJS = auth_skel.so
+AUTH_OBJS = auth_skel.la
 
 # Default target
 
@@ -17,8 +17,8 @@
 
 # Pattern rules
 
-%.so: %.lo
-	$(LIBTOOL) --mode=link $(CC) -shared -o $@ $< $(LDFLAGS)
+%.la: %.lo
+	$(LIBTOOL) --mode=link $(CC) -module -o $@ $< $(LDFLAGS)
 
 %.lo: %.c
 	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
@@ -28,4 +28,4 @@
 clean:
 	rm -rf .libs
 	rm -f core *~ *% *.bak \
-		$(AUTH_OBJS) $(AUTH_OBJS:.so=.o) $(AUTH_OBJS:.so=.lo) 
+		$(AUTH_OBJS) $(AUTH_OBJS:.la=.o) $(AUTH_OBJS:.la=.lo) 

Modified: trunk/examples/pdb/Makefile
===================================================================
--- trunk/examples/pdb/Makefile	2005-01-30 22:45:46 UTC (rev 5111)
+++ trunk/examples/pdb/Makefile	2005-01-30 22:47:26 UTC (rev 5112)
@@ -9,7 +9,7 @@
 UBIQX_SRC = ../../source/ubiqx
 SMBWR_SRC = ../../source/smbwrapper
 CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g -I/usr/include/heimdal -fPIC
-PDB_OBJS = test.so
+PDB_OBJS = test.la
 
 # Default target
 
@@ -17,8 +17,8 @@
 
 # Pattern rules
 
-%.so: %.lo
-	$(LIBTOOL) --mode=link $(CC) -shared -o $@ $< $(LDFLAGS)
+%.la: %.lo
+	$(LIBTOOL) --mode=link $(CC) -module -o $@ $< $(LDFLAGS) -rpath /usr/lib/samba/pdb/
 
 %.lo: %.c
 	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
@@ -28,4 +28,4 @@
 clean:
 	rm -rf .libs
 	rm -f core *~ *% *.bak \
-		$(PDB_OBJS) $(PDB_OBJS:.so=.o) $(PDB_OBJS:.so=.lo) 
+		$(PDB_OBJS) $(PDB_OBJS:.la=.o) $(PDB_OBJS:.la=.lo)