summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-11 01:02:16 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-11 01:02:16 +0100
commit8ba668bb05478640609b31739270a0b6b8738067 (patch)
tree4f9867425454e86cde3ed4e2ca82e32abfc8cde9 /source4
parent1813b711c42a46c86391d0a44dd0be1466fd3b9c (diff)
downloadsamba-8ba668bb05478640609b31739270a0b6b8738067.tar.gz
samba-8ba668bb05478640609b31739270a0b6b8738067.tar.bz2
samba-8ba668bb05478640609b31739270a0b6b8738067.zip
Move some more variables to static .mk file.
(This used to be commit a72d3ffaded5624732972708c305b8f84f47fed7)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm16
-rw-r--r--source4/main.mk6
2 files changed, 9 insertions, 13 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index c28229c23b..865d231c0c 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -92,17 +92,7 @@ CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\
INSTALL_LINK_FLAGS=$extra_link_flags
-BNLD=$self->{config}->{LD}
-BNLD_FLAGS=$self->{config}->{LDFLAGS} -L$libdir
-
-SHLD_FLAGS=$self->{config}->{SHLD_FLAGS} -L\$(builddir)/bin/shared
-
-MDLD_FLAGS=$self->{config}->{MDLD_FLAGS} -L\$(builddir)/bin/shared
-
-HOSTCC_FLAGS=-D_SAMBA_HOSTCC_ \$(CFLAGS)
-
-HOSTLD_FLAGS=$self->{config}->{LDFLAGS}
-
+INTERN_LDFLAGS = -L$libdir
__EOD__
);
}
@@ -245,7 +235,7 @@ __EOD__
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $init_obj
\@echo Linking \$\@
\@mkdir -p $ctx->{SHAREDDIR}
- \@\$(MDLD) \$(MDLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+ \@\$(MDLD) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
\$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) $init_obj \\
\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS)
__EOD__
@@ -303,7 +293,7 @@ sub SharedLibrary($$)
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
\@echo Linking \$\@
\@mkdir -p $ctx->{SHAREDDIR}
- \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+ \@\$(SHLD) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
\$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) \\
\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \\
$soarg$lns
diff --git a/source4/main.mk b/source4/main.mk
index 0f492c10f4..f7ef4b445a 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -7,6 +7,12 @@ JSDIR = $(datadir)/js
SETUPDIR = $(datadir)/setup
NCALRPCDIR = $(localstatedir)/ncalrpc
+BNLD = $(LD)
+BNLD_FLAGS = $(LDFLAGS)
+
+HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
+HOSTLD_FLAGS = $(LDFLAGS)
+
default: all
include dynconfig.mk