diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-10-26 14:18:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:16 -0500 |
| commit | 8ee1ee66edb1c98b63cbc26741080932995156a4 (patch) | |
| tree | 06d6d15aeb9addb392328abcae53bb7673b7b91d /source4/lib | |
| parent | bf300c868781fed3b0c0556b4e40608589ad1585 (diff) | |
| download | samba-8ee1ee66edb1c98b63cbc26741080932995156a4.tar.gz samba-8ee1ee66edb1c98b63cbc26741080932995156a4.tar.bz2 samba-8ee1ee66edb1c98b63cbc26741080932995156a4.zip | |
r11303: Support defining and installing public headers for libraries.
Support installing libraries.
Get rid of pkg-config file (will be autogenerated later on).
(This used to be commit b4745032a2c55752c527026feb221ccc3dce10c8)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/config.mk | 1 | ||||
| -rw-r--r-- | source4/lib/registry/config.m4 | 2 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 1 | ||||
| -rw-r--r-- | source4/lib/registry/winregistry.pc.in | 10 | ||||
| -rw-r--r-- | source4/lib/talloc/config.mk | 1 | ||||
| -rw-r--r-- | source4/lib/tdb/config.mk | 1 |
6 files changed, 4 insertions, 12 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 6e948f20df..31c75a1712 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -98,6 +98,7 @@ REQUIRED_SUBSYSTEMS = \ LIBREPLACE LIBTALLOC LDBSAMBA NOPROTO = YES MANPAGE = man/ldb.3 +PUBLIC_HEADERS = include/ldb.h # # End SUBSYSTEM LIBLDB ################################################ diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4 index d0d1d2c54b..27e55c63b4 100644 --- a/source4/lib/registry/config.m4 +++ b/source4/lib/registry/config.m4 @@ -5,8 +5,6 @@ if test t$BLDSHARED = ttrue; then fi LIBWINREG=libwinregistry -AC_CONFIG_FILES(lib/registry/winregistry.pc) - SMB_MODULE_DEFAULT(registry_gconf, NOT) SMB_EXT_LIB_FROM_PKGCONFIG(gconf, gconf-2.0) diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 288e3d21ee..51387df303 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -90,6 +90,7 @@ ADD_OBJ_FILES = \ patchfile.o REQUIRED_SUBSYSTEMS = \ LIBBASIC +PUBLIC_HEADERS = registry.h # End MODULE registry_ldb ################################################ diff --git a/source4/lib/registry/winregistry.pc.in b/source4/lib/registry/winregistry.pc.in deleted file mode 100644 index ad134da236..0000000000 --- a/source4/lib/registry/winregistry.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: winregistry -Description: Windows registry library -Version: @PACKAGE_VERSION@ -Libs: @LIBS@ @REG_LIBS@ -L${prefix}/lib -lwinregistry -Cflags: -I${includedir} @CFLAGS@ @CFLAGS@ diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 5d88616b15..a4be0eb9ff 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -8,6 +8,7 @@ INIT_OBJ_FILES = talloc.o REQUIRED_SUBSYSTEMS = LIBREPLACE NOPROTO = YES MANPAGE = talloc.3 +PUBLIC_HEADERS = talloc.h # # End LIBRARY LIBTALLOC ################################################ diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index b68a121190..4d96b6c161 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -12,6 +12,7 @@ ADD_OBJ_FILES = common/dump.o common/io.o common/lock.o \ NOPROTO=YES REQUIRED_SUBSYSTEMS = \ LIBREPLACE +PUBLIC_HEADERS = include/tdb.h # # End SUBSYSTEM LIBLDB ################################################ |