From b785a7c40c185512207ef8da837a766933073032 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 16 Mar 2006 21:36:36 +0000 Subject: r14492: Fix shared libs - set SO_VERSION to 0 everywhere for now. (This used to be commit 4682bc5ce047d81586447b9df82c91ed1fe677cf) --- source4/auth/gensec/config.mk | 2 +- source4/build/smb_build/makefile.pm | 5 +- source4/build/smb_build/output.pm | 2 +- source4/gtk/config.mk | 2 +- source4/heimdal_build/config.mk | 2 +- source4/lib/ldb/config.mk | 2 +- source4/lib/registry/config.mk | 2 +- source4/lib/samba3/config.mk | 2 +- source4/lib/socket_wrapper/config.mk | 2 +- source4/lib/talloc/config.mk | 2 +- source4/lib/tdb/config.mk | 2 +- source4/lib/tdr/config.mk | 2 +- source4/lib/tdr/tdr.c | 6 +- source4/lib/tdr/tdr.h | 9 ++ source4/lib/util/config.mk | 2 +- source4/lib/util/util.h | 2 + source4/libcli/config.mk | 8 +- source4/libnet/config.mk | 2 +- source4/librpc/config.mk | 186 +++++++++++++++++------------------ source4/main.mk | 4 +- source4/nsswitch/config.mk | 2 +- source4/ntvfs/config.mk | 2 +- 22 files changed, 132 insertions(+), 118 deletions(-) (limited to 'source4') diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index 1e5518c545..728e29a025 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM gensec [LIBRARY::gensec] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = Generic Security Library PUBLIC_HEADERS = gensec.h spnego.h PUBLIC_PROTO_HEADER = gensec_proto.h diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index c6752ecde6..7bb7dedb53 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -23,6 +23,7 @@ sub new($$$) $self->{bin_progs} = []; $self->{static_libs} = []; $self->{shared_libs} = []; + $self->{installable_shared_libs} = []; $self->{headers} = []; $self->{shared_modules} = []; $self->{plugins} = []; @@ -213,6 +214,7 @@ sub SharedLibrary($$) if ($ctx->{TYPE} eq "LIBRARY") { push (@{$self->{shared_libs}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}"); + push (@{$self->{installable_shared_libs}}, "$installdir/$ctx->{LIBRARY_REALNAME}"); } elsif ($ctx->{TYPE} eq "MODULE") { push (@{$self->{shared_modules}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}"); push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}"); @@ -442,7 +444,7 @@ sub PkgConfig($$) smb_build::env::PkgConfig($self, $path, $link_name, - $ctx->{OUTPUT}, + "-l$link_name", "", "$ctx->{VERSION}", $ctx->{DESCRIPTION} @@ -491,6 +493,7 @@ sub write($$) $self->output("BINARIES = " . array2oneperline($self->{binaries}) . "\n"); $self->output("STATIC_LIBS = " . array2oneperline($self->{static_libs}) . "\n"); $self->output("SHARED_LIBS = " . array2oneperline($self->{shared_libs}) . "\n"); + $self->output("INSTALLABLE_SHARED_LIBS = " . array2oneperline($self->{installable_shared_libs}) . "\n"); $self->output("PUBLIC_HEADERS = " . array2oneperline($self->{headers}) . "\n"); $self->output("PC_FILES = " . array2oneperline($self->{pc_files}) . "\n"); $self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n"); diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 21885bed8c..594d1d48c7 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -66,7 +66,7 @@ sub generate_shared_library($) $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{SO_VERSION}"; $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_NAME}.".$lib->{VERSION}"; } elsif ($lib->{TYPE} eq "MODULE") { - $lib->{DEBUDIR} = "bin/modules/$lib->{SUBSYSTEM}"; + $lib->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}"; } $lib->{TARGET} = "$lib->{DEBUGDIR}/$lib->{LIBRARY_REALNAME}"; $lib->{OUTPUT} = $lib->{TARGET}; diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk index e344a2260e..b1588ba6d0 100644 --- a/source4/gtk/config.mk +++ b/source4/gtk/config.mk @@ -2,7 +2,7 @@ [LIBRARY::GTK_SAMBA] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = Common Samba-related widgets for GTK+ applications 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 81d6a99f18..1bc466effc 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -470,7 +470,7 @@ 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 +SO_VERSION = 0 REQUIRED_SUBSYSTEMS = \ HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \ HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_VERS HEIMDAL_GLUE EXT_LIB_RESOLV diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index f8f1086396..19ea9f6580 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -130,7 +130,7 @@ REQUIRED_SUBSYSTEMS = \ # Start SUBSYSTEM ldb [LIBRARY::ldb] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = LDAP-like embedded database library INIT_FUNCTION_TYPE = int (*) (void) OBJ_FILES = \ diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 02071d721b..13700939cb 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -84,7 +84,7 @@ REQUIRED_SUBSYSTEMS = \ # Start SUBSYSTEM registry [LIBRARY::registry] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = Windows-style registry library OBJ_FILES = \ common/reg_interface.o \ diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk index 9411f12913..5ec76c1339 100644 --- a/source4/lib/samba3/config.mk +++ b/source4/lib/samba3/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM LIBSAMBA3 [LIBRARY::LIBSAMBA3] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 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 fd2fc92b31..baa11b4675 100644 --- a/source4/lib/socket_wrapper/config.mk +++ b/source4/lib/socket_wrapper/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM SOCKET_WRAPPER [LIBRARY::SOCKET_WRAPPER] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets PUBLIC_HEADERS = socket_wrapper.h OBJ_FILES = socket_wrapper.o diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 86a6f4bd56..95d3ac359d 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -2,7 +2,7 @@ # Start LIBRARY LIBTALLOC [LIBRARY::LIBTALLOC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 OBJ_FILES = talloc.o REQUIRED_SUBSYSTEMS = LIBREPLACE MANPAGE = talloc.3 diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index 8eb127f8ae..82119d04ca 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM LIBTDB [LIBRARY::LIBTDB] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 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 4160ad1ce9..7ecbab35d1 100644 --- a/source4/lib/tdr/config.mk +++ b/source4/lib/tdr/config.mk @@ -1,7 +1,7 @@ [LIBRARY::TDR] PUBLIC_HEADERS = tdr.h VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = Simple marshall/unmarshall library PUBLIC_PROTO_HEADER = tdr_proto.h OBJ_FILES = tdr.o diff --git a/source4/lib/tdr/tdr.c b/source4/lib/tdr/tdr.c index cd1650e30d..e108473708 100644 --- a/source4/lib/tdr/tdr.c +++ b/source4/lib/tdr/tdr.c @@ -129,7 +129,7 @@ NTSTATUS tdr_print_uint32(struct tdr_print *tdr, const char *name, uint32_t *v) return NT_STATUS_OK; } -NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, int chset) +NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, charset_t chset) { int ret; @@ -165,7 +165,7 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, return NT_STATUS_OK; } -NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, int chset) +NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, charset_t chset) { ssize_t ret, required; @@ -192,7 +192,7 @@ NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, return NT_STATUS_OK; } -NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, int chset) +NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, charset_t chset) { tdr->print(tdr, "%-25s: %s", name, *v); return NT_STATUS_OK; diff --git a/source4/lib/tdr/tdr.h b/source4/lib/tdr/tdr.h index 8ca6717cee..4c0280d9d6 100644 --- a/source4/lib/tdr/tdr.h +++ b/source4/lib/tdr/tdr.h @@ -18,6 +18,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __TDR_H__ +#define __TDR_H__ + +#include "core.h" +#include "lib/talloc/talloc.h" +#include "charset/charset.h" + #define TDR_BIG_ENDIAN 0x01 #define TDR_ALIGN2 0x02 #define TDR_ALIGN4 0x04 @@ -56,3 +63,5 @@ typedef NTSTATUS (*tdr_push_fn_t) (struct tdr_push *, const void *); typedef NTSTATUS (*tdr_pull_fn_t) (struct tdr_pull *, TALLOC_CTX *, void *); #include "tdr/tdr_proto.h" + +#endif /* __TDR_H__ */ diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index e4a3784a91..a0eabaaf31 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -1,6 +1,6 @@ [LIBRARY::LIBBASIC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = Generic utility functions PUBLIC_PROTO_HEADER = util_proto.h PUBLIC_HEADERS = util.h \ diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h index e0255c692c..60cba737a9 100644 --- a/source4/lib/util/util.h +++ b/source4/lib/util/util.h @@ -24,6 +24,8 @@ #ifndef _SAMBA_UTIL_H_ #define _SAMBA_UTIL_H_ +#include "charset/charset.h" + /** * @file * @brief Helpful macros diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 6d88b3bd06..b214803215 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -41,7 +41,7 @@ OBJ_FILES = nbt/nbtname.o [LIBRARY::LIBCLI_NBT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = NetBios over TCP/IP client library PRIVATE_PROTO_HEADER = nbt/nbt_proto.h OBJ_FILES = \ @@ -64,7 +64,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_NBT [LIBRARY::LIBCLI_CLDAP] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = CLDAP client library OBJ_FILES = cldap/cldap.o PUBLIC_HEADERS = cldap/cldap.h @@ -73,7 +73,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_LDAP [LIBRARY::LIBCLI_WREPL] PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = WINS Replication client library OBJ_FILES = \ wrepl/winsrepl.o @@ -97,7 +97,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_NBT MESSAGING [LIBRARY::LIBCLI] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 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 aeb94564dc..295ceeaeab 100644 --- a/source4/libnet/config.mk +++ b/source4/libnet/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM LIBNET [LIBRARY::LIBNET] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 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 83ac97821b..5b3e193905 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM LIBNDR [LIBRARY::LIBNDR] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = Network Data Representation Core Library PUBLIC_HEADERS = ndr/libndr.h PUBLIC_PROTO_HEADER = ndr/libndr_proto.h @@ -20,7 +20,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC # Start SUBSYSTEM NDR_COMPRESSION [LIBRARY::NDR_COMPRESSION] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = NDR support for compressed subcontexts PRIVATE_PROTO_HEADER = ndr/ndr_compression.h OBJ_FILES = \ @@ -35,7 +35,7 @@ OBJ_FILES = ndr/ndr_sec_helper.o ndr/ndr_sec.o [LIBRARY::NDR_SECURITY] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_security.o PUBLIC_HEADERS = gen_ndr/security.h @@ -43,63 +43,63 @@ REQUIRED_SUBSYSTEMS = NDR_MISC NDR_SECURITY_HELPER [LIBRARY::NDR_AUDIOSRV] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_audiosrv.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_DNSSERVER] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dnsserver.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_WINSTATION] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_winstation.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_ECHO] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_echo.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_IRPC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_irpc.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_EXCHANGE] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_exchange.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_DSBACKUP] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dsbackup.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_EFS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_efs.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_MISC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_misc.o PUBLIC_HEADERS = gen_ndr/misc.h gen_ndr/ndr_misc.h @@ -107,14 +107,14 @@ REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_ROT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_rot.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_LSA] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_lsa.o PUBLIC_HEADERS = gen_ndr/lsa.h @@ -122,14 +122,14 @@ REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_DFS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dfs.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_DRSUAPI] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_drsuapi.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION NDR_SECURITY @@ -140,35 +140,35 @@ OBJ_FILES = ndr/ndr_drsuapi.o [LIBRARY::NDR_DRSBLOBS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_drsblobs.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_SASL_HELPERS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_sasl_helpers.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_POLICYAGENT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_policyagent.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_UNIXINFO] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_unixinfo.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_SAMR] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_samr.o PUBLIC_HEADERS = gen_ndr/samr.h @@ -176,7 +176,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY [LIBRARY::NDR_SPOOLSS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_spoolss.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_SPOOLSS_BUF @@ -187,105 +187,105 @@ OBJ_FILES = ndr/ndr_spoolss_buf.o [LIBRARY::NDR_WKSSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_wkssvc.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_SRVSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_srvsvc.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_SVCCTL [LIBRARY::NDR_SVCCTL] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_svcctl.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_ATSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_atsvc.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_EVENTLOG] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_eventlog.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_EPMAPPER] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_epmapper.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_DBGIDL] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dbgidl.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_DSSETUP] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dssetup.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_MSGSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_msgsvc.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_WINS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_wins.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_WINREG] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_winreg.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_INITSHUTDOWN [LIBRARY::NDR_INITSHUTDOWN] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_initshutdown.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_MGMT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_mgmt.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_PROTECTED_STORAGE] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_protected_storage.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_DCOM] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dcom.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC @@ -296,63 +296,63 @@ OBJ_FILES = ndr/ndr_orpc.o [LIBRARY::NDR_ORPC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_orpc.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC_MANUAL [LIBRARY::NDR_OXIDRESOLVER] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_oxidresolver.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC [LIBRARY::NDR_REMACT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_remact.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC [LIBRARY::NDR_WZCSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_wzcsvc.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_BROWSER] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_browser.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_W32TIME] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_w32time.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_SCERPC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_scerpc.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_NTSVCS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_ntsvcs.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_NETLOGON] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_netlogon.o PUBLIC_HEADERS = gen_ndr/netlogon.h @@ -360,21 +360,21 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR NDR_LSA [LIBRARY::NDR_TRKWKS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_trkwks.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_KEYSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_keysvc.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_KRB5PAC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_krb5pac.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL NDR_NETLOGON @@ -385,35 +385,35 @@ OBJ_FILES = ndr/ndr_krb5pac.o [LIBRARY::NDR_XATTR] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_xattr.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_SECURITY [LIBRARY::NDR_OPENDB] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_opendb.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_SCHANNEL] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_schannel.o REQUIRED_SUBSYSTEMS = LIBNDR [LIBRARY::NDR_NBT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_nbt.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL [LIBRARY::NDR_WINSREPL] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_winsrepl.o REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT @@ -426,7 +426,7 @@ OBJ_FILES = gen_ndr/tables.o [LIBRARY::NDR_TABLE] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = rpc/table.o PRIVATE_PROTO_HEADER = rpc/dcerpc_table.h @@ -445,259 +445,259 @@ REQUIRED_SUBSYSTEMS = \ [LIBRARY::RPC_NDR_ROT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_rot_c.o REQUIRED_SUBSYSTEMS = NDR_ROT dcerpc [LIBRARY::RPC_NDR_AUDIOSRV] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_audiosrv_c.o REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV dcerpc [LIBRARY::RPC_NDR_ECHO] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_echo_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO [LIBRARY::RPC_NDR_EXCHANGE] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_exchange_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_EXCHANGE [LIBRARY::RPC_NDR_DSBACKUP] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dsbackup_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_DSBACKUP [LIBRARY::RPC_NDR_EFS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_efs_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_EFS [LIBRARY::RPC_NDR_LSA] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_lsa_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA [LIBRARY::RPC_NDR_DFS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dfs_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS [LIBRARY::RPC_NDR_DRSUAPI] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_drsuapi_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI [LIBRARY::RPC_NDR_POLICYAGENT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_policyagent_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_POLICYAGENT [LIBRARY::RPC_NDR_UNIXINFO] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_unixinfo_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_UNIXINFO [LIBRARY::RPC_NDR_SAMR] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_samr_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR [LIBRARY::RPC_NDR_SPOOLSS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_spoolss_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS [LIBRARY::RPC_NDR_WKSSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_wkssvc_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC [LIBRARY::RPC_NDR_SRVSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_srvsvc_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC [LIBRARY::RPC_NDR_SVCCTL] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_svcctl_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL [LIBRARY::RPC_NDR_ATSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_atsvc_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_ATSVC [LIBRARY::RPC_NDR_EVENTLOG] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_eventlog_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG [LIBRARY::RPC_NDR_EPMAPPER] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_epmapper_c.o REQUIRED_SUBSYSTEMS = NDR_EPMAPPER [LIBRARY::RPC_NDR_DBGIDL] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dbgidl_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_DBGIDL [LIBRARY::RPC_NDR_DSSETUP] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dssetup_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_DSSETUP [LIBRARY::RPC_NDR_MSGSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_msgsvc_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_MSGSVC [LIBRARY::RPC_NDR_WINS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_wins_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_WINS [LIBRARY::RPC_NDR_WINREG] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_winreg_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG [LIBRARY::RPC_NDR_INITSHUTDOWN] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_initshutdown_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN [LIBRARY::RPC_NDR_MGMT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_mgmt_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_MGMT [LIBRARY::RPC_NDR_PROTECTED_STORAGE] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_protected_storage_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_PROTECTED_STORAGE [LIBRARY::DCOM_PROXY_DCOM] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_dcom_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_DCOM [LIBRARY::RPC_NDR_OXIDRESOLVER] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_OXIDRESOLVER [LIBRARY::RPC_NDR_REMACT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_remact_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_REMACT [LIBRARY::RPC_NDR_WZCSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_WZCSVC [LIBRARY::RPC_NDR_W32TIME] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_w32time_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_W32TIME [LIBRARY::RPC_NDR_SCERPC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_scerpc_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_SCERPC [LIBRARY::RPC_NDR_NTSVCS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_NTSVCS [LIBRARY::RPC_NDR_NETLOGON] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_netlogon_c.o REQUIRED_SUBSYSTEMS = NDR_NETLOGON [LIBRARY::RPC_NDR_TRKWKS] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_trkwks_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_TRKWKS [LIBRARY::RPC_NDR_KEYSVC] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_keysvc_c.o REQUIRED_SUBSYSTEMS = dcerpc NDR_KEYSVC @@ -711,7 +711,7 @@ PUBLIC_HEADERS = gen_ndr/dcerpc.h gen_ndr/ndr_dcerpc.h # Start SUBSYSTEM dcerpc [LIBRARY::dcerpc] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = DCE/RPC client library PUBLIC_HEADERS = rpc/dcerpc.h PUBLIC_PROTO_HEADER = rpc/dcerpc_proto.h diff --git a/source4/main.mk b/source4/main.mk index 429b326f8b..75432ef4a1 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -123,8 +123,8 @@ installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs $(DESTDIR)$(VARDIR) \ $(BIN_PROGS) -installlib: libraries installdirs - @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) $(SHARED_LIBS) +installlib: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs + @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) $(INSTALLABLE_SHARED_LIBS) @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) $(STATIC_LIBS) installheader: headers installdirs diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk index 19e3fae0bb..84c059b947 100644 --- a/source4/nsswitch/config.mk +++ b/source4/nsswitch/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM LIBWINBIND_CLIENT [LIBRARY::LIBWINBIND_CLIENT] VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = Client library for communicating with winbind OBJ_FILES = wb_common.o # End SUBSYSTEM LIBWINBIND_CLIENT diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk index e365d73631..3f05bfa7be 100644 --- a/source4/ntvfs/config.mk +++ b/source4/ntvfs/config.mk @@ -67,7 +67,7 @@ OBJ_FILES = \ [LIBRARY::ntvfs] PUBLIC_HEADERS = ntvfs.h VERSION = 0.0.1 -SO_VERSION = 0.0.1 +SO_VERSION = 0 DESCRIPTION = Virtual File System with NTFS semantics PRIVATE_PROTO_HEADER = ntvfs_proto.h OBJ_FILES = \ -- cgit