diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-12 03:26:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:25:30 -0500 |
| commit | 95caeb1046c1899075238400fb07092542c91dcd (patch) | |
| tree | b5ad1355643d2fb231ae819b6c83e5dda7bb3acc | |
| parent | 66494b1fc9da4c9964be7572f6ef6985cb78321d (diff) | |
| download | samba-95caeb1046c1899075238400fb07092542c91dcd.tar.gz samba-95caeb1046c1899075238400fb07092542c91dcd.tar.bz2 samba-95caeb1046c1899075238400fb07092542c91dcd.zip | |
r19678: Fix the build for now (ugly hack because of circular dependencies)
(This used to be commit 0953bb7d5f2f2a81688f5421e1fbfa3bc38aa810)
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 1 | ||||
| -rw-r--r-- | source4/lib/charset/config.mk | 1 | ||||
| -rw-r--r-- | source4/utils/config.mk | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index c11a0458d8..f89e817f5f 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -76,6 +76,7 @@ my $section_types = { "PUBLIC_HEADERS" => "list", "CFLAGS" => "list", + "LDFLAGS" => "list", "STANDARD_VISIBILITY" => "string", "USE_HOSTCC" => "bool" diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk index 4f0c80c79d..fff447574f 100644 --- a/source4/lib/charset/config.mk +++ b/source4/lib/charset/config.mk @@ -9,5 +9,6 @@ PUBLIC_HEADERS = charset.h PUBLIC_PROTO_HEADER = charset_proto.h PUBLIC_DEPENDENCIES = ICONV PRIVATE_DEPENDENCIES = DYNCONFIG +LDFLAGS = -lsamba-config -lsamba-util # End SUBSYSTEM CHARSET ################################################ diff --git a/source4/utils/config.mk b/source4/utils/config.mk index 69d5a3b77f..0e5b5e2990 100644 --- a/source4/utils/config.mk +++ b/source4/utils/config.mk @@ -50,6 +50,7 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-UTIL \ NDR_XATTR \ WRAP_XATTR + # End BINARY getntacl ################################# |