r12254: Add some (hopefully correct) descriptions for libraries that are installed.

Install pkg-config files.

diff --git a/source/auth/gensec/config.mk b/source/auth/gensec/config.mk
index 57f7bc4f0d28b2488ffaee1a10996b3cdac33b2e..8c51560f8684377c2a8591ae7991c2b1eb71a0b5 100644 (file)
--- a/source/auth/gensec/config.mk
+++ b/source/auth/gensec/config.mk
@@ -3,6 +3,7 @@
 [LIBRARY::GENSEC]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = Generic Security Library
 RELEASE_VERSION = 1
 PUBLIC_HEADERS = gensec.h
 INIT_FUNCTION = gensec_init

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 986d1aa2135882f4bac77168e8f39fa9b795462d..6982e28977193b1be3bea11c8c034fc44fe73179 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -238,7 +238,7 @@ sub SharedLibrary($$)
 {
        my ($self,$ctx) = @_;
 
-       push (@{$self->{shared_libs}}, "bin/$ctx->{LIBRARY_NAME}");
+       push (@{$self->{shared_libs}}, "bin/$ctx->{LIBRARY_REALNAME}");
 
        $self->_prepare_list($ctx, "OBJ_LIST");
        $self->_prepare_list($ctx, "CFLAGS");
@@ -408,6 +408,11 @@ sub PkgConfig($$)
        $link_name =~ s/^LIB//g;
        $link_name = lc($link_name);
 
+       if (not defined($ctx->{DESCRIPTION})) {
+               warn("$ctx->{NAME} has not DESCRIPTION set, not generating .pc file");
+               return;
+       }
+
        my $path = "$ctx->{BASEDIR}/$link_name.pc";
 
        push (@{$self->{pc_files}}, $path);

diff --git a/source/gtk/config.mk b/source/gtk/config.mk
index da3ee1353d4c9e9be7e17316259dac5f4551a830..5ad1fa71843b1a234ffaaac8cd333ba79fb2246c 100644 (file)
--- a/source/gtk/config.mk
+++ b/source/gtk/config.mk
@@ -4,6 +4,7 @@
 # Start SUBSYSTEM GTKSMB
 [LIBRARY::GTKSMB]
 MAJOR_VERSION = 0
+DESCRIPTION = Common Samba-related widgets for GTK+ applications
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 NOPROTO = YES

diff --git a/source/lib/basic.mk b/source/lib/basic.mk
index a5311450600dd7ee54c8b370a21ec234309d9a9f..486f8d8a1e03d728194fa8eb98208b340c3eb435 100644 (file)
--- a/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@ -32,6 +32,7 @@ PUBLIC_HEADERS = tdr/tdr.h
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = Simple marshall/unmarshall library
 INIT_OBJ_FILES = tdr/tdr.o
 
 ##############################

diff --git a/source/lib/ldb/config.mk b/source/lib/ldb/config.mk
index 31c75a17126c5af4ea9708a1b4a89a8ee3732053..a47fd5957739f781981feb6deb59dbadff3d4895 100644 (file)
--- a/source/lib/ldb/config.mk
+++ b/source/lib/ldb/config.mk
@@ -80,6 +80,7 @@ NOPROTO = YES
 [LIBRARY::LIBLDB]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = LDAP-like embedded database library
 RELEASE_VERSION = 1
 INIT_OBJ_FILES = \
                common/ldb.o

diff --git a/source/lib/registry/config.mk b/source/lib/registry/config.mk
index 51387df303ca499281d4d625409d4eaa28918dcc..a76595b94d69b5f302215c763a871a51192dac65 100644 (file)
--- a/source/lib/registry/config.mk
+++ b/source/lib/registry/config.mk
@@ -81,6 +81,7 @@ REQUIRED_SUBSYSTEMS = \
 [LIBRARY::REGISTRY]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = Windows-style registry library
 RELEASE_VERSION = 1
 INIT_OBJ_FILES = \
                common/reg_interface.o

diff --git a/source/lib/samba3/config.mk b/source/lib/samba3/config.mk
index f98a4562619a420054ddf6cef454e48573298774..ff6771a244dfbe8831bef45c22d45a37abb63de9 100644 (file)
--- a/source/lib/samba3/config.mk
+++ b/source/lib/samba3/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = Library for reading Samba3 data files
 PUBLIC_HEADERS = samba3.h
 ADD_OBJ_FILES = smbpasswd.o tdbsam.o policy.o \
                idmap.o winsdb.o samba3.o group.o \

diff --git a/source/lib/socket_wrapper/config.mk b/source/lib/socket_wrapper/config.mk
index b4a4d8c4d0b577fddc7cc4b1e20d371dcbd261a4..92a97e557e2707751851604de6e775892bf41365 100644 (file)
--- a/source/lib/socket_wrapper/config.mk
+++ b/source/lib/socket_wrapper/config.mk
@@ -5,6 +5,7 @@ MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
 NOPROTO = YES
+DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
 PUBLIC_HEADERS = socket_wrapper.h
 INIT_OBJ_FILES = socket_wrapper.o
 # End SUBSYSTEM SOCKET_WRAPPER

diff --git a/source/lib/tdb/config.mk b/source/lib/tdb/config.mk
index 4d96b6c161d12c9a50ac7c2d568c3451e6ab096a..69483aad923f4c8c4067d3cb8247a569ba65d3a3 100644 (file)
--- a/source/lib/tdb/config.mk
+++ b/source/lib/tdb/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = Trivial Database Library
 INIT_OBJ_FILES = \
                common/tdb.o
 ADD_OBJ_FILES = common/dump.o common/io.o common/lock.o \

diff --git a/source/libcli/config.mk b/source/libcli/config.mk
index cbbc2f423534ae86c1895797bdffde903d3a299a..782dac2dd722850d5553ba5bea638f0794bf3a8a 100644 (file)
--- a/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@ -34,6 +34,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_COMPOSITE
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = NetBios over TCP/IP client library
 ADD_OBJ_FILES = \
        nbt/nbtname.o \
        nbt/nbtsocket.o \
@@ -58,6 +59,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = CLDAP client library
 ADD_OBJ_FILES = cldap/cldap.o
 PUBLIC_HEADERS = cldap/cldap.h
 NOPROTO=YES
@@ -67,6 +69,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = WINS Replication client library
 ADD_OBJ_FILES = \
        wrepl/winsrepl.o
 REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS
@@ -84,6 +87,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = SMB/CIFS client library
 REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
        LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIB_SECURITY LIBCLI_RESOLVE \
        LIBCLI_DGRAM LIBCLI_SMB2

diff --git a/source/libnet/config.mk b/source/libnet/config.mk
index 0234f3f866b3ccfff4be3bef3d2e502e241e77ec..e998675fcbf2b8d0203db5079775756b41fd331b 100644 (file)
--- a/source/libnet/config.mk
+++ b/source/libnet/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = User-friendly access to Samba interfaces
 PUBLIC_HEADERS = libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
                                 libnet_rpc.h libnet_share.h libnet_time.h libnet_user.h \
                                 libnet_vampire.h userinfo.h userman.h

diff --git a/source/librpc/config.mk b/source/librpc/config.mk
index bf50a23608cd60f2f67f87d307a191d21ad904d0..fafdae0f9c21bbaad9b0238a6762b8478822e7b5 100644 (file)
--- a/source/librpc/config.mk
+++ b/source/librpc/config.mk
@@ -4,6 +4,7 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
 RELEASE_VERSION = 1
+DESCRIPTION = Network Data Representation Core Library
 PUBLIC_HEADERS = ndr/libndr.h
 INIT_OBJ_FILES = \
                ndr/ndr.o
@@ -539,6 +540,7 @@ NOPROTO = YES
 [LIBRARY::LIBRPC]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = DCE/RPC client library
 RELEASE_VERSION = 1
 PUBLIC_HEADERS = rpc/dcerpc.h
 REQUIRED_SUBSYSTEMS = LIBNDR RPC_RAW LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_LSA NDR_NETLOGON NDR_SAMR NDR_UNIXINFO RPC_NDR_NETLOGON RPC_NDR_EPMAPPER

diff --git a/source/main.mk b/source/main.mk
index 74d33c8f3246be38d5be10ebdfbca6e359ef6e8d..585265bc24a1f23d29031576113a563be373b8e4 100644 (file)
--- a/source/main.mk
+++ b/source/main.mk
@@ -65,6 +65,7 @@ INSTALLPERMS = 0755
 # These can be overridden by command line switches (see smbd(8))
 # or in smb.conf (see smb.conf(5))
 CONFIGFILE = $(CONFIGDIR)/smb.conf
+PKGCONFIGDIR = $(LIBDIR)/pkgconfig
 LMHOSTSFILE = $(CONFIGDIR)/lmhosts
 
 PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" \
@@ -75,7 +76,7 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\" \
         -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\"
 
 install: showlayout installbin installdat installswat installmisc installlib \
-       installheader
+       installheader installpc
 
 # DESTDIR is used here to prevent packagers wasting their time
 # duplicating the Makefile. Remove it and you will have the privilege
@@ -86,7 +87,7 @@ install: showlayout installbin installdat installswat installmisc installlib \
 # is not used.
 
 installdirs:
-       @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(PRIVATEDIR)/tls $(DESTDIR)$(INCLUDEDIR)
+       @$(SHELL) $(srcdir)/script/installdirs.sh $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PRIVATEDIR) $(DESTDIR)$(PIDDIR) $(DESTDIR)$(LOCKDIR) $(DESTDIR)$(PRIVATEDIR)/tls $(DESTDIR)$(INCLUDEDIR) $(DESTDIR)$(PKGCONFIGDIR)
 
 installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs
        @$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(SBIN_PROGS)
@@ -111,6 +112,9 @@ installman: installdirs
 installmisc: installdirs
        @$(SHELL) $(srcdir)/script/installmisc.sh $(srcdir) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR)
 
+installpc: installdirs
+       @cp $(PC_FILES) $(DESTDIR)$(PKGCONFIGDIR)
+
 uninstall: uninstallbin uninstallman uninstallmisc uninstalllib uninstallheader
 
 uninstallmisc:

diff --git a/source/nsswitch/config.mk b/source/nsswitch/config.mk
index 12bea83825342e7d43cf0104ac11dd99519dafa9..cefc704c6ee01bf5132795f50fd9a91c1f356839 100644 (file)
--- a/source/nsswitch/config.mk
+++ b/source/nsswitch/config.mk
@@ -3,6 +3,7 @@
 [LIBRARY::LIBWINBIND_CLIENT]
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = Client library for communicating with winbind
 RELEASE_VERSION = 1
 ADD_OBJ_FILES = wb_common.o
 NOPROTO=YES

diff --git a/source/ntvfs/config.mk b/source/ntvfs/config.mk
index 2ab484610e11d983a51811929edbcc0185f5a491..95f0886d06908a7f0523633a4135296fa50239bb 100644 (file)
--- a/source/ntvfs/config.mk
+++ b/source/ntvfs/config.mk
@@ -77,6 +77,7 @@ ADD_OBJ_FILES = \
 PUBLIC_HEADERS = ntvfs.h
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
+DESCRIPTION = Virtual File System with NTFS semantics
 RELEASE_VERSION = 1
 INIT_OBJ_FILES = \
                ntvfs_base.o