svn commit: samba r5016 - in branches/SAMBA_4_0/source: build/smb_build scripting/swig

[tpot at samba.org]

Author: tpot
Date: 2005-01-26 20:40:59 +0000 (Wed, 26 Jan 2005)
New Revision: 5016

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

Log:
Use LIBRARY instead of BINARY for inserting the swig stuff into the
build system.  This still generates bogus targets (i.e 
bin/swig_dcerpc.so.0.0.1) and the subsystem initialisation needs to be
done by hand but it is less of a hack.

Removed:
   branches/SAMBA_4_0/source/scripting/swig/dummymain.c
Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/scripting/swig/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-01-26 20:36:44 UTC (rev 5015)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-01-26 20:40:59 UTC (rev 5016)
@@ -676,17 +676,17 @@
 scripting/swig/tdb.py: scripting/swig/tdb.i
 	swig -python scripting/swig/tdb.i
 
-scripting/swig/_tdb.so: scripting/swig/tdb.py scripting/swig/tdb_wrap.o \$(BINARY_swig_tdb_LINK_LIST)
+scripting/swig/_tdb.so: scripting/swig/tdb.py scripting/swig/tdb_wrap.o \$(LIBRARY_swig_tdb_DEPEND_LIST)
 	\$(SHLD) \$(SHLD_FLAGS) -o scripting/swig/_tdb.so scripting/swig/tdb_wrap.o \\
-		\$(BINARY_swig_tdb_LINK_LIST) \$(BINARY_swig_tdb_LINK_FLAGS)
+		\$(LIBRARY_swig_tdb_SHARED_LINK_LIST) \$(LIBRARY_swig_tdb_SHARED_LINK_FLAGS)
 
-SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/winreg.i librpc/gen_ndr/spoolss.i
+SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
 
 scripting/swig/dcerpc.py: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i \$(SWIG_INCLUDES)
 	swig -python scripting/swig/dcerpc.i
 
-scripting/swig/_dcerpc.so: scripting/swig/dcerpc.py scripting/swig/dcerpc_wrap.o \$(BINARY_swig_dcerpc_DEPEND_LIST)
-	\$(SHLD) \$(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o \$(BINARY_swig_dcerpc_DEPEND_LIST) \$(BINARY_swig_dcerpc_LINK_FLAGS)
+scripting/swig/_dcerpc.so: scripting/swig/dcerpc.py scripting/swig/dcerpc_wrap.o \$(LIBRARY_swig_dcerpc_DEPEND_LIST)
+	\$(SHLD) \$(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o \$(LIBRARY_swig_dcerpc_SHARED_LINK_LIST) \$(LIBRARY_swig_dcerpc_SHARED_LINK_FLAGS)
 
 swig_clean:
 	-rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc \\

Modified: branches/SAMBA_4_0/source/scripting/swig/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/swig/config.mk	2005-01-26 20:36:44 UTC (rev 5015)
+++ branches/SAMBA_4_0/source/scripting/swig/config.mk	2005-01-26 20:40:59 UTC (rev 5016)
@@ -1,7 +1,11 @@
-[BINARY::swig_tdb]
-OBJ_FILES = scripting/swig/dummymain.o
+[LIBRARY::swig_tdb]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
 REQUIRED_SUBSYSTEMS = LIBTDB
 
-[BINARY::swig_dcerpc]
-OBJ_FILES = scripting/swig/dummymain.o
+[LIBRARY::swig_dcerpc]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
 REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR

Deleted: branches/SAMBA_4_0/source/scripting/swig/dummymain.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/swig/dummymain.c	2005-01-26 20:36:44 UTC (rev 5015)
+++ branches/SAMBA_4_0/source/scripting/swig/dummymain.c	2005-01-26 20:40:59 UTC (rev 5016)
@@ -1,9 +0,0 @@
-/* 
- * Dummy main function as the build system doesn't seem to create a
- * dependency list for a subsystem.
- */
-
-int main(void)
-{
-	return 0;
-}