25 files changed, 258 insertions, 407 deletions
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 911b958313..a6335692d8 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -1,10 +1,9 @@
 #################################
 # Start SUBSYSTEM gensec
 [LIBRARY::gensec]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Generic Security Library
-RELEASE_VERSION = 1
 PUBLIC_HEADERS = gensec.h
 PRIVATE_PROTO_HEADER = gensec_proto.h
 OBJ_FILES = gensec.o
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index cb92772cf1..b9607cd593 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,5 +1,4 @@
 - subdir handler for install headers into a specific directory
-- sonames
 - hack for loading modules locally
  - create 
 - saner names for some of the .pc files
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 7eb0ddc56d..c0d05a4e6f 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -71,9 +71,8 @@ my $section_types = {
 		"EXTRA_CFLAGS"		=> "string"
 		},
 	"LIBRARY" => {
-		"MAJOR_VERSION"		=> "string",
-		"MINOR_VERSION"		=> "string",
-		"RELEASE_VERSION"	=> "string",
+		"VERSION"		=> "string",
+		"SO_VERSION"		=> "string",
 		
 		"INIT_FUNCTION_TYPE"	=> "string",
 
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 73157758c0..f83e04f0c4 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -88,8 +88,13 @@ sub check_library($$$)
 
 	$lib->{OUTPUT_TYPE} = $default_ot;
 
-	unless (defined($lib->{MAJOR_VERSION})) {
-		print "$lib->{NAME}: Please specify MAJOR_VERSION\n";
+	if (defined($lib->{VERSION}) and not defined($lib->{SO_VERSION})) {
+		print "$lib->{NAME}: Please specify SO_VERSION when specifying VERSION\n";
+		return;
+	}
+
+	if (defined($lib->{SO_VERSION}) and not defined($lib->{VERSION})) {
+		print "$lib->{NAME}: Please specify VERSION when specifying SO_VERSION\n";
 		return;
 	}
 
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 130dd188c6..733b447e40 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -67,7 +67,7 @@ foreach my $key (values %$OUTPUT) {
 	$mkenv->ObjList($key) if $key->{OUTPUT_TYPE} eq "OBJLIST";
 	$mkenv->StaticLibrary($key) if $key->{OUTPUT_TYPE} eq "STATIC_LIBRARY";
 	$mkenv->PkgConfig($key) if ($key->{OUTPUT_TYPE} eq "SHARED_LIBRARY") and
-						defined($key->{MAJOR_VERSION});
+						defined($key->{VERSION});
 	$mkenv->SharedLibrary($key) if $key->{OUTPUT_TYPE} eq "SHARED_LIBRARY";
 	$mkenv->Binary($key) if $key->{OUTPUT_TYPE} eq "BINARY";
 	$mkenv->Manpage($key) if defined($key->{MANPAGE});
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index f17deb53f9..8ab19e980d 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -131,7 +131,6 @@ STLD_FLAGS=-rc -L\$(builddir)/bin
 
 SHLD=$self->{config}->{CC}
 SHLD_FLAGS=$self->{config}->{LDSHFLAGS} -L\$(builddir)/bin
-SONAMEFLAG=$self->{config}->{SONAMEFLAG}
 SHLIBEXT=$self->{config}->{SHLIBEXT}
 
 XSLTPROC=$self->{config}->{XSLTPROC}
@@ -258,6 +257,12 @@ __EOD__
 		$init_obj = "bin/$ctx->{NAME}_init_module.o";
 	}
 
+	my $soarg = "";
+	if ($self->{config}->{SONAMEFLAG} ne "" and 
+		defined($ctx->{LIBRARY_SONAME})) {
+		$soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} ";
+	}
+
 	if ($self->{duplicate_build}) {
 		$self->output(<< "__EOD__"
 #
@@ -265,25 +270,11 @@ __EOD__
 bin/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
 	\@echo Linking \$\@
 	\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
-		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \\
+		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
 		$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
 
 __EOD__
 );
-		if (defined($ctx->{LIBRARY_SONAME})) {
-			$self->output(<< "__EOD__"
-# Symlink $ctx->{LIBRARY_SONAME}
-bin/$ctx->{LIBRARY_SONAME}: bin/$ctx->{LIBRARY_REALNAME} 
-	\@echo Symlink \$\@
-	\@ln -sf $ctx->{LIBRARY_REALNAME} \$\@
-# Symlink $ctx->{LIBRARY_NAME}
-bin/$ctx->{LIBRARY_NAME}: bin/$ctx->{LIBRARY_SONAME} 
-	\@echo Symlink \$\@
-	\@ln -sf $ctx->{LIBRARY_SONAME} \$\@
-
-__EOD__
-);
-		}
 	}
 
 	$self->output(<< "__EOD__"
@@ -292,25 +283,11 @@ __EOD__
 $installdir/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
 	\@echo Linking \$\@
 	\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\
-		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \\
+		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
 		$init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
 
 __EOD__
 );
-	if (defined($ctx->{LIBRARY_SONAME})) {
-	    $self->output(<< "__EOD__"
-# Symlink $ctx->{LIBRARY_SONAME}
-$installdir/$ctx->{LIBRARY_SONAME}: $installdir/$ctx->{LIBRARY_REALNAME}
-	\@echo Symlink \$\@
-	\@ln -sf $ctx->{LIBRARY_REALNAME} \$\@
-# Symlink $ctx->{LIBRARY_NAME}
-$installdir/$ctx->{LIBRARY_NAME}: $installdir/$ctx->{LIBRARY_SONAME}
-	\@echo Symlink \$\@
-	\@ln -sf $ctx->{LIBRARY_SONAME} \$\@
-
-__EOD__
-);
-	}
 }
 
 sub MergedObj($$)
@@ -486,7 +463,7 @@ sub PkgConfig($$)
 		$link_name,
 		$ctx->{OUTPUT},
 		"",
-		"$ctx->{MAJOR_VERSION}.$ctx->{MINOR_VERSION}.$ctx->{RELEASE_VERSION}",
+		"$ctx->{VERSION}",
 		$ctx->{DESCRIPTION}
 	); 
 }
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 0897232f98..2a0d592895 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -56,17 +56,15 @@ sub generate_shared_library($)
 		$link_name =~ s/^LIB//;
 		$link_name = lc($link_name);
 		$lib_name = "lib$link_name";
-		$lib->{OUTPUT} = "-l$link_name";
 	}
 
 	$lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME} = "$lib_name.\$(SHLIBEXT)";
-	$lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}";
-	if (defined($lib->{MAJOR_VERSION})) {
-		$lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{MAJOR_VERSION}";
-		$lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_SONAME}.".$lib->{MINOR_VERSION}.$lib->{RELEASE_VERSION}";
-		$lib->{TARGET} = "bin/$lib->{LIBRARY_REALNAME}";
-		@{$lib->{LINK_FLAGS}} = ("\$(SONAMEFLAG)$lib->{LIBRARY_SONAME}");
+	if (defined($lib->{VERSION})) {
+		$lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{SO_VERSION}";
+		$lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME}.".$lib->{VERSION}";
 	}
+	$lib->{TARGET} = "bin/$lib->{LIBRARY_REALNAME}";
+	$lib->{OUTPUT} = $lib->{TARGET};
 }
 
 sub generate_static_library($)
@@ -143,11 +141,7 @@ sub create_output($$)
 			push(@{$part->{LINK_LIST}}, $elem->{OUTPUT}) if defined($elem->{OUTPUT});
 			push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
 			push(@{$part->{LINK_FLAGS}},@{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
-			if (defined($elem->{OUTPUT_TYPE}) and ($elem->{OUTPUT_TYPE} eq "SHARED_LIBRARY")) {
-			    push(@{$part->{DEPEND_LIST}}, "bin/$elem->{LIBRARY_NAME}");			    
-			} else { 
-			    push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET});
-			}
+		    push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET});
 			push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, $elem->{INIT_FUNCTION}) if 
 				defined($elem->{INIT_FUNCTION}) and 
 				$elem->{TYPE} ne "MODULE" and 
diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk
index 0a77a166e5..72563aaac4 100644
--- a/source4/gtk/config.mk
+++ b/source4/gtk/config.mk
@@ -1,10 +1,9 @@
 # LIB GTK SMB subsystem
 
 [LIBRARY::GTK_SAMBA]
-MAJOR_VERSION = 0
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Common Samba-related widgets for GTK+ applications
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
 NOPROTO = YES
 PUBLIC_HEADERS = common/gtk-smb.h common/select.h
 OBJ_FILES = common/gtk-smb.o \
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index a02c5008b7..fef7f8105d 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -481,6 +481,8 @@ heimdal_clean:	hdb_asn1_clean spnego_asn1_clean krb5_asn1_clean
 #######################
 # Start SUBSYSTEM HEIMDAL
 [LIBRARY::HEIMDAL]
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = \
 		HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index da9f5f7076..5fbe782626 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -132,11 +132,10 @@ NOPROTO = YES
 ################################################
 # Start SUBSYSTEM ldb
 [LIBRARY::ldb]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = LDAP-like embedded database library
 INIT_FUNCTION_TYPE = int (*) (void)
-RELEASE_VERSION = 1
 OBJ_FILES = \
 		common/ldb.o \
 		common/ldb_ldif.o \
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 1c006b3e09..4456d57ccc 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -84,10 +84,9 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start SUBSYSTEM registry
 [LIBRARY::registry]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Windows-style registry library
-RELEASE_VERSION = 1
 OBJ_FILES = \
 		common/reg_interface.o \
 		common/reg_util.o \
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index fc741ced0d..9411f12913 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -1,9 +1,8 @@
 ################################################
 # Start SUBSYSTEM LIBSAMBA3
 [LIBRARY::LIBSAMBA3]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Library for reading Samba3 data files
 PRIVATE_PROTO_HEADER = samba3_proto.h
 PUBLIC_HEADERS = samba3.h
diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index 38eabee6b3..dcc3835194 100644
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -1,9 +1,8 @@
 ##############################
 # Start SUBSYSTEM SOCKET_WRAPPER
 [LIBRARY::SOCKET_WRAPPER]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 NOPROTO = YES
 DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
 PUBLIC_HEADERS = socket_wrapper.h
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 70be4d0f4f..e63edb0139 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -1,9 +1,8 @@
 ################################################
 # Start LIBRARY LIBTALLOC
 [LIBRARY::LIBTALLOC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 OBJ_FILES = talloc.o
 REQUIRED_SUBSYSTEMS = LIBREPLACE
 NOPROTO = YES
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index c9785775d1..b6595ea2ba 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -1,9 +1,8 @@
 ################################################
 # Start SUBSYSTEM LIBTDB
 [LIBRARY::LIBTDB]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Trivial Database Library
 OBJ_FILES = \
 	common/tdb.o common/dump.o common/io.o common/lock.o \
diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk
index f42aeeb75b..8aa3f85056 100644
--- a/source4/lib/tdr/config.mk
+++ b/source4/lib/tdr/config.mk
@@ -1,8 +1,7 @@
 [LIBRARY::TDR]
 PUBLIC_HEADERS = tdr.h
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Simple marshall/unmarshall library
 PRIVATE_PROTO_HEADER = tdr_proto.h
 OBJ_FILES = tdr.o
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index cf2e038709..9740de2020 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -1,7 +1,6 @@
 [LIBRARY::LIBBASIC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Generic utility functions
 PRIVATE_PROTO_HEADER = util_proto.h
 PUBLIC_HEADERS = util.h \
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 1c030e0d0d..41faf36237 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -39,9 +39,8 @@ REQUIRED_SUBSYSTEMS = LIBCLI_COMPOSITE
 OBJ_FILES = nbt/nbtname.o\
 
 [LIBRARY::LIBCLI_NBT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = NetBios over TCP/IP client library
 PRIVATE_PROTO_HEADER = nbt/nbt_proto.h
 OBJ_FILES = \
@@ -64,9 +63,8 @@ NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 
 [LIBRARY::LIBCLI_CLDAP]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = CLDAP client library
 OBJ_FILES = cldap/cldap.o
 PUBLIC_HEADERS = cldap/cldap.h
@@ -75,9 +73,8 @@ REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
 
 [LIBRARY::LIBCLI_WREPL]
 PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = WINS Replication client library
 OBJ_FILES = \
 	wrepl/winsrepl.o
@@ -100,9 +97,8 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT MESSAGING
 
 [LIBRARY::LIBCLI]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = SMB/CIFS client library
 REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
 	LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIB_SECURITY LIBCLI_RESOLVE \
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index b8be43dbdb..aeb94564dc 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -1,9 +1,8 @@
 #################################
 # Start SUBSYSTEM LIBNET
 [LIBRARY::LIBNET]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = User-friendly access to Samba interfaces
 PRIVATE_PROTO_HEADER = libnet_proto.h
 PUBLIC_HEADERS = libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 29a5d7bafa..a3f6a82597 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -1,9 +1,8 @@
 ################################################
 # Start SUBSYSTEM LIBNDR
 [LIBRARY::LIBNDR]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Network Data Representation Core Library
 PUBLIC_HEADERS = ndr/libndr.h
 PRIVATE_PROTO_HEADER = ndr/libndr_proto.h
@@ -20,10 +19,9 @@ REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC
 ################################################
 # Start SUBSYSTEM NDR_COMPRESSION
 [LIBRARY::NDR_COMPRESSION]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
-DESCRIPTION =
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
+DESCRIPTION = NDR support for compressed subcontexts
 OBJ_FILES = \
 		ndr/ndr_compression.o
 REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
@@ -34,126 +32,112 @@ REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
 OBJ_FILES = ndr/ndr_sec_helper.o ndr/ndr_sec.o
 
 [LIBRARY::NDR_SECURITY]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_security.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_MISC NDR_SECURITY_HELPER
 
 [LIBRARY::NDR_AUDIOSRV]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_audiosrv.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DNSSERVER]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dnsserver.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_WINSTATION]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winstation.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_ECHO]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_echo.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_IRPC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_irpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EXCHANGE]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_exchange.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DSBACKUP]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dsbackup.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EFS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_efs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_MISC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_misc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_ROT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_rot.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_LSA]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_lsa.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DFS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dfs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DRSUAPI]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsuapi.o
 NOPROTO = YES
@@ -163,54 +147,48 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION NDR_SECURITY
 OBJ_FILES = ndr/ndr_drsuapi.o
 
 [LIBRARY::NDR_DRSBLOBS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsblobs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SASL_HELPERS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_POLICYAGENT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_policyagent.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_UNIXINFO]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_unixinfo.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SAMR]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_samr.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
 
 [LIBRARY::NDR_SPOOLSS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_spoolss.o
 NOPROTO = YES
@@ -220,135 +198,120 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_SPOOLSS_BUF
 OBJ_FILES = ndr/ndr_spoolss_buf.o
 
 [LIBRARY::NDR_WKSSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wkssvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SRVSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_srvsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SVCCTL
 
 [LIBRARY::NDR_SVCCTL]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_svcctl.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_ATSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_atsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EVENTLOG]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_eventlog.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EPMAPPER]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_epmapper.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DBGIDL]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dbgidl.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DSSETUP]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dssetup.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_MSGSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_msgsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_WINS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wins.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_WINREG]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winreg.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_INITSHUTDOWN
 
 [LIBRARY::NDR_INITSHUTDOWN]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_initshutdown.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_MGMT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_mgmt.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_PROTECTED_STORAGE]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_protected_storage.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DCOM]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dcom.o
 NOPROTO = YES
@@ -358,108 +321,96 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 OBJ_FILES = ndr/ndr_orpc.o 
 
 [LIBRARY::NDR_ORPC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_orpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC_MANUAL
 
 [LIBRARY::NDR_OXIDRESOLVER]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_oxidresolver.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [LIBRARY::NDR_REMACT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_remact.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [LIBRARY::NDR_WZCSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wzcsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_BROWSER]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_browser.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_W32TIME]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_w32time.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SCERPC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_scerpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_NTSVCS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_ntsvcs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_NETLOGON]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_netlogon.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR NDR_LSA
 
 [LIBRARY::NDR_TRKWKS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_trkwks.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_KEYSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_keysvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_KRB5PAC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_krb5pac.o
 NOPROTO = YES
@@ -469,45 +420,40 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL NDR_NETLOGON
 OBJ_FILES = ndr/ndr_krb5pac.o
 
 [LIBRARY::NDR_XATTR]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_xattr.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SECURITY
 
 [LIBRARY::NDR_OPENDB]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_opendb.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SCHANNEL]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_schannel.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_NBT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_nbt.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL
 
 [LIBRARY::NDR_WINSREPL]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winsrepl.o
 NOPROTO = YES
@@ -521,9 +467,8 @@ OBJ_FILES = gen_ndr/tables.o
 NOPROTO = YES
 
 [LIBRARY::NDR_TABLE]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = rpc/table.o 
 PRIVATE_PROTO_HEADER = rpc/dcerpc_table.h
@@ -541,333 +486,296 @@ REQUIRED_SUBSYSTEMS = \
 	NDR_SASL_HELPERS
 
 [LIBRARY::RPC_NDR_ROT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_rot_c.o
 REQUIRED_SUBSYSTEMS = NDR_ROT dcerpc
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_AUDIOSRV]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_audiosrv_c.o
 REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV dcerpc
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_ECHO]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_echo_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_EXCHANGE]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_exchange_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EXCHANGE
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DSBACKUP]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dsbackup_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DSBACKUP
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_EFS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_efs_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EFS
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_LSA]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_lsa_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DFS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dfs_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DRSUAPI]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsuapi_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_POLICYAGENT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_policyagent_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_POLICYAGENT
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_UNIXINFO]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_UNIXINFO
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SAMR]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_samr_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SPOOLSS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_spoolss_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_WKSSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wkssvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SRVSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_srvsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SVCCTL]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_svcctl_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_ATSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_atsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_ATSVC
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_EVENTLOG]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_eventlog_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_EPMAPPER]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_epmapper_c.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DBGIDL]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dbgidl_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DBGIDL
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DSSETUP]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dssetup_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DSSETUP
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_MSGSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_msgsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_MSGSVC
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_WINS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wins_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WINS
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_WINREG]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winreg_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_INITSHUTDOWN]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_MGMT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_MGMT
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_PROTECTED_STORAGE]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_PROTECTED_STORAGE
 NOPROTO = YES
 
 [LIBRARY::DCOM_PROXY_DCOM]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dcom_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DCOM
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_OXIDRESOLVER]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_OXIDRESOLVER
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_REMACT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_remact_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_REMACT
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_WZCSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WZCSVC
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_W32TIME]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_w32time_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_W32TIME
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SCERPC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_scerpc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SCERPC
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_NTSVCS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_NTSVCS
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_NETLOGON]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_netlogon_c.o
 REQUIRED_SUBSYSTEMS = NDR_NETLOGON
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_TRKWKS]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_trkwks_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_TRKWKS
 NOPROTO = YES
 
 [LIBRARY::RPC_NDR_KEYSVC]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_keysvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_KEYSVC
@@ -881,10 +789,9 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC
 ################################################
 # Start SUBSYSTEM dcerpc
 [LIBRARY::dcerpc]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = DCE/RPC client library
-RELEASE_VERSION = 1
 PUBLIC_HEADERS = rpc/dcerpc.h
 PRIVATE_PROTO_HEADER = rpc/dcerpc_proto.h
 OBJ_FILES = \
diff --git a/source4/main.mk b/source4/main.mk
index 87537a5e5e..cea417d302 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -78,15 +78,6 @@ CONFIGFILE = $(CONFIGDIR)/smb.conf
 PKGCONFIGDIR = $(LIBDIR)/pkgconfig
 LMHOSTSFILE = $(CONFIGDIR)/lmhosts
 
-PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" \
-	 -DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
-	 -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \
-	 -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
-	 -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
-	 -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
-	 -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
-	 -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
-
 install: showlayout installbin installdat installswat installmisc installlib \
 	installheader installpc installplugins
 
diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index 7b7e5b9a20..0279f447c5 100644
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -1,10 +1,9 @@
 #################################
 # Start SUBSYSTEM LIBWINBIND_CLIENT
 [LIBRARY::LIBWINBIND_CLIENT]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Client library for communicating with winbind
-RELEASE_VERSION = 1
 OBJ_FILES = wb_common.o
 NOPROTO=YES
 # End SUBSYSTEM LIBWINBIND_CLIENT
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index 4ed2bcf7c3..e365d73631 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -66,11 +66,10 @@ OBJ_FILES = \
 # Start SUBSYSTEM NTVFS
 [LIBRARY::ntvfs]
 PUBLIC_HEADERS = ntvfs.h
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
+VERSION = 0.0.1
+SO_VERSION = 0.0.1
 DESCRIPTION = Virtual File System with NTFS semantics
 PRIVATE_PROTO_HEADER = ntvfs_proto.h
-RELEASE_VERSION = 1
 OBJ_FILES = \
 		ntvfs_base.o \
 		ntvfs_generic.o \
diff --git a/source4/param/config.mk b/source4/param/config.mk
index 3b06bd99ff..b6e94c004c 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -6,6 +6,15 @@ OBJ_FILES = ../dynconfig.o \
 REQUIRED_SUBSYSTEMS = LIBBASIC 
 PRIVATE_PROTO_HEADER = param.h
 
+PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" \
+	 -DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
+	 -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \
+	 -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \
+	 -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
+	 -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \
+	 -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
+	 -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
+
 dynconfig.o: dynconfig.c Makefile
 	@echo Compiling $<
 	@$(CC) $(CFLAGS) $(PICFLAG) $(PATH_FLAGS) -c $< -o $@
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index aae428cbff..7111f307ff 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -79,22 +79,7 @@ REQUIRED_SUBSYSTEMS = \
 		LIBNET LIBSMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
-		NDR_TABLE \
-		RPC_EJS_SECURITY \
-		RPC_EJS_LSA \
-		RPC_EJS_ECHO \
-		RPC_EJS_WINREG \
-		RPC_EJS_DFS \
-		RPC_EJS_MISC \
-		RPC_EJS_EVENTLOG \
-		RPC_EJS_SAMR \
-		RPC_EJS_WKSSVC \
-		RPC_EJS_SRVSVC \
-		RPC_EJS_SVCCTL \
-		RPC_EJS_INITSHUTDOWN \
-		RPC_EJS_NETLOGON \
-		RPC_EJS_DRSUAPI \
-		RPC_EJS_IRPC
+		NDR_TABLE
 # End SUBSYSTEM smbcalls
 #######################