TORTUREDIR as target dir for binaries is no longer used, remove it.
[samba.git] / source4 / build / smb_build / makefile.pm
index e033e0e4b2dff55b0a661604bd3e0efcbb9eb2e9..50a16c543f0181e2c86168a3ba5a2d9317445a41 100644 (file)
@@ -7,9 +7,12 @@
 
 package smb_build::makefile;
 use smb_build::env;
+use smb_build::output;
+use File::Basename;
 use strict;
 
 use base 'smb_build::env';
+use Cwd 'abs_path';
 
 sub new($$$)
 {
@@ -22,7 +25,10 @@ sub new($$$)
        $self->{sbin_progs} = [];
        $self->{bin_progs} = [];
        $self->{static_libs} = [];
+       $self->{python_dsos} = [];
+       $self->{python_pys} = [];
        $self->{shared_libs} = [];
+       $self->{installable_shared_libs} = [];
        $self->{headers} = [];
        $self->{shared_modules} = [];
        $self->{plugins} = [];
@@ -34,20 +40,17 @@ sub new($$$)
 
        $self->{mkfile} = $mkfile;
 
-       $self->output("#!gmake\n");
        $self->output("################################################\n");
        $self->output("# Autogenerated by build/smb_build/makefile.pm #\n");
        $self->output("################################################\n");
        $self->output("\n");
 
-       $self->output("default: all\n\n");
-
-       $self->_prepare_path_vars();
        $self->_prepare_compiler_linker();
-       $self->output(".SUFFIXES: .x .c .et .y .l .d .o .h .h.gch .a .so .1 .1.xml .3 .3.xml .5 .5.xml .7 .7.xml .8 .8.xml .ho\n");
-       $self->_prepare_hostcc_rule();
-       $self->_prepare_std_CC_rule("c","o",'$(PICFLAG)',"Compiling","Rule for std objectfiles");
-       $self->_prepare_std_CC_rule("h","h.gch",'$(PICFLAG)',"Precompiling","Rule for precompiled headerfiles");
+
+       if (!$self->{automatic_deps}) {
+               $self->output("ALL_PREDEP = proto\n");
+               $self->output(".NOTPARALLEL:\n");
+       }
 
        return $self;
 }
@@ -59,95 +62,32 @@ sub output($$)
        $self->{output} .= $text;
 }
 
-sub _prepare_path_vars($)
-{
-       my ($self) = @_;
-
-       $self->output(<< "__EOD__"
-prefix = $self->{config}->{prefix}
-exec_prefix = $self->{config}->{exec_prefix}
-selftest_prefix = $self->{config}->{selftest_prefix}
-VPATH = $self->{config}->{srcdir}
-srcdir = $self->{config}->{srcdir}
-builddir = $self->{config}->{builddir}
-
-BASEDIR = $self->{config}->{prefix}
-BINDIR = $self->{config}->{bindir}
-SBINDIR = $self->{config}->{sbindir}
-LIBDIR = $self->{config}->{libdir}
-MODULESDIR = $self->{config}->{libdir}
-INCLUDEDIR = $self->{config}->{includedir}
-CONFIGDIR = $self->{config}->{sysconfdir}
-SWATDIR = $self->{config}->{datadir}/swat
-JSDIR = $self->{config}->{datadir}/js
-SETUPDIR = $self->{config}->{datadir}/setup
-VARDIR = $self->{config}->{localstatedir}
-LOGFILEBASE = $self->{config}->{logfilebase}
-NCALRPCDIR = $self->{config}->{localstatedir}/ncalrpc
-LOCKDIR = $self->{config}->{lockdir}
-PIDDIR = $self->{config}->{piddir}
-MANDIR = $self->{config}->{mandir}
-PRIVATEDIR = $self->{config}->{privatedir}
-WINBINDD_SOCKET_DIR = $self->{config}->{winbindd_socket_dir}
-
-__EOD__
-);
-}
-
 sub _prepare_compiler_linker($)
 {
        my ($self) = @_;
 
-       my $devld_local = "";
-       my $devld_install = "";
+       my $builddir_headers = "";
+       my $libdir;
+       my $extra_link_flags = "";
 
-       $self->{duplicate_build} = 0;
-       if ($self->{config}->{LIBRARY_OUTPUT_TYPE} eq "SHARED_LIBRARY") {
-               if ($self->{developer}) {
-                       $self->{duplicate_build} = 1;
-                       $devld_local = " -Wl,-rpath,\$(builddir)/bin";
-               }
-               $devld_install = " -Wl,-rpath-link,\$(builddir)/bin";
+       if ($self->{config}->{USESHARED} eq "true") {
+               $libdir = "\$(builddir)/bin/shared";
+               $extra_link_flags = "-Wl,-rpath-link,\$(builddir)/bin/shared";
+       } else {
+               $libdir = "\$(builddir)/bin/static";
+       }
+       
+       if (!(abs_path($self->{config}->{srcdir}) eq abs_path($self->{config}->{builddir}))) {
+           $builddir_headers= "-I\$(builddir)/include -I\$(builddir) -I\$(builddir)/lib ";
        }
 
        $self->output(<< "__EOD__"
-SHELL=$self->{config}->{SHELL}
-
-PERL=$self->{config}->{PERL}
-
-CPP=$self->{config}->{CPP}
-CPPFLAGS=$self->{config}->{CPPFLAGS}
-
-CC=$self->{config}->{CC}
-CFLAGS=-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -D_SAMBA_BUILD_ -DHAVE_CONFIG_H $self->{config}->{CFLAGS} \$(CPPFLAGS)
-PICFLAG=$self->{config}->{PICFLAG}
-HOSTCC=$self->{config}->{HOSTCC}
-
-LOCAL_LINK_FLAGS=$devld_local
-INSTALL_LINK_FLAGS=$devld_install
-
-LD=$self->{config}->{LD} 
-LDFLAGS=$self->{config}->{LDFLAGS} -L\$(builddir)/bin
-
-STLD=$self->{config}->{AR}
-STLD_FLAGS=-rc -L\$(builddir)/bin
-
-SHLD=$self->{config}->{CC}
-SHLD_FLAGS=$self->{config}->{LDSHFLAGS} -L\$(builddir)/bin
-SONAMEFLAG=$self->{config}->{SONAMEFLAG}
-SHLIBEXT=$self->{config}->{SHLIBEXT}
 
-XSLTPROC=$self->{config}->{XSLTPROC}
+CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\$(srcdir)/lib/replace -I\$(srcdir)/lib/talloc -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H $self->{config}->{CPPFLAGS}
 
-LEX=$self->{config}->{LEX}
-YACC=$self->{config}->{YACC}
-YAPP=$self->{config}->{YAPP}
-PIDL_ARGS=$self->{config}->{PIDL_ARGS}
-
-GCOV=$self->{config}->{GCOV}
-
-DEFAULT_TEST_TARGET=$self->{config}->{DEFAULT_TEST_TARGET}
+INSTALL_LINK_FLAGS=$extra_link_flags
 
+INTERN_LDFLAGS = -L$libdir
 __EOD__
 );
 }
@@ -157,67 +97,28 @@ sub _prepare_mk_files($)
        my $self = shift;
        my @tmp = ();
 
-       
        foreach (@smb_build::config_mk::parsed_files) {
                s/ .*$//g;
                push (@tmp, $_);
        }
 
-       $self->output("MK_FILES = " . array2oneperline(\@tmp) . "\n");
-}
-
-sub _prepare_dummy_MAKEDIR($)
-{
-       my ($self) = @_;
-
-       $self->output(<< '__EOD__'
-dynconfig.o: dynconfig.c Makefile
-       @echo Compiling $*.c
-       @$(CC) $(CFLAGS) $(PICFLAG) $(PATH_FLAGS) -c $< -o $@
-__EOD__
-);
-       if ($self->{config}->{BROKEN_CC} eq "yes") {
-               $self->output(' -mv `echo $@ | sed \'s%^.*/%%g\'` $@
-');
-       }
-       $self->output("\n");
-}
-
-sub _prepare_std_CC_rule($$$$$$)
-{
-       my ($self,$src,$dst,$flags,$message,$comment) = @_;
-
-       $self->output(<< "__EOD__"
-# $comment
-.$src.$dst:
-       \@echo $message \$\*.$src
-       \@\$(CC) `script/cflags.pl \$\@` \$(CFLAGS) $flags -c \$\*.$src -o \$\@
-__EOD__
-);
-       if ($self->{config}->{BROKEN_CC} eq "yes") {
-               $self->output(' -mv `echo $@ | sed \'s%^.*/%%g\'` $@
-');
+       if ($self->{gnu_make}) {
+               $self->output("
+ifneq (\$(MAKECMDGOALS),clean)
+ifneq (\$(MAKECMDGOALS),distclean)
+ifneq (\$(MAKECMDGOALS),realdistclean)
+");
        }
 
-       $self->output("\n");
-}
+       $self->output("MK_FILES = " . array2oneperline(\@tmp) . "\n");
 
-sub _prepare_hostcc_rule($)
-{
-       my ($self) = @_;
-       
-       $self->output(<< "__EOD__"
-.c.ho:
-       \@echo Compiling \$\*.c with host compiler
-       \@\$(HOSTCC) `script/cflags.pl \$\@` \$(CFLAGS) -c \$\*.c -o \$\@
-__EOD__
-);
-       if ($self->{config}->{BROKEN_CC} eq "yes") {
-               $self->output(' -mv `echo $@ | sed \'s%^.*/%%g\' -e \'s%\.ho$$%.o%\'` $@
-');
+       if ($self->{gnu_make}) {
+               $self->output("
+endif
+endif
+endif
+");
        }
-
-       $self->output("\n");
 }
 
 sub array2oneperline($)
@@ -234,67 +135,75 @@ sub array2oneperline($)
        return $output;
 }
 
-sub _prepare_list($$$)
+sub _prepare_list_ex($$$$$)
 {
-       my ($self,$ctx,$var) = @_;
+       my ($self,$ctx,$var,$pre,$post) = @_;
+       my @tmparr = ();
 
-       my $tmplist = array2oneperline($ctx->{$var});
+       push(@tmparr, $pre) if defined($pre);
+       push(@tmparr, @{$ctx->{$var}}) if defined($ctx->{$var});
+       push(@tmparr, $post) if defined($post);
+
+       my $tmplist = array2oneperline(\@tmparr);
        return if ($tmplist eq "");
 
        $self->output("$ctx->{TYPE}\_$ctx->{NAME}_$var =$tmplist\n");
 }
 
-sub DependencyInfo($$)
+sub _prepare_list($$$)
+{
+       my ($self,$ctx,$var) = @_;
+
+       $self->_prepare_list_ex($ctx, $var, undef, undef);
+}
+
+sub Integrated($$)
 {
        my ($self,$ctx) = @_;
 
-       $self->output("bin/deps/$ctx->{TYPE}_$ctx->{NAME}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)");
-       $self->output("\n");
-       $self->output("\t\@echo \"Generating dependency info for $ctx->{NAME}\"\n");
-       $self->output("\t\@./script/cdeps.pl \$^ > \$@\n");
-       $self->output("\n");
-       $self->output("-include bin/deps/$ctx->{TYPE}_$ctx->{NAME}\n\n");
+       $self->_prepare_list($ctx, "OBJ_LIST");
+       $self->_prepare_list($ctx, "FULL_OBJ_LIST");
+       $self->_prepare_list($ctx, "LINK_FLAGS");
 }
 
-sub SharedLibrary($$)
+sub SharedModule($$)
 {
        my ($self,$ctx) = @_;
 
-       my $installdir;
        my $init_obj = "";
+
+       my $sane_subsystem = lc($ctx->{SUBSYSTEM});
+       $sane_subsystem =~ s/^lib//;
        
-       if ($self->{duplicate_build}) {
-               $installdir = "bin/install";
+       if ($ctx->{TYPE} eq "PYTHON") {
+               push (@{$self->{python_dsos}}, 
+                       "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
        } else {
-               $installdir = "bin";
-       }
-
-       if ($ctx->{TYPE} eq "LIBRARY") {
-               push (@{$self->{shared_libs}}, "bin/$ctx->{LIBRARY_REALNAME}");
-       } elsif ($ctx->{TYPE} eq "MODULE") {
-               push (@{$self->{shared_modules}}, "bin/$ctx->{LIBRARY_REALNAME}");
-               push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
-
-               $self->{install_plugins} .= "\t\@echo Install $installdir/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)/\n";
-               $self->{install_plugins} .= "\t\@mkdir -p \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/\n";
-               $self->{install_plugins} .= "\t\@cp $installdir/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
-               $self->{uninstall_plugins} .= "\t\@echo Uninstall \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
-               $self->{uninstall_plugins} .= "\t\@rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
+               push (@{$self->{shared_modules}}, "$ctx->{TARGET_SHARED_LIBRARY}");
+               push (@{$self->{plugins}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}");
+               $self->{install_plugins} .= "\t\@echo Installing $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n";
+               $self->{install_plugins} .= "\t\@mkdir -p \$(DESTDIR)\$(modulesdir)/$sane_subsystem/\n";
+               $self->{install_plugins} .= "\t\@cp $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n";
+               $self->{uninstall_plugins} .= "\t\@echo Uninstalling \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n";
+               $self->{uninstall_plugins} .= "\t\@-rm \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$ctx->{LIBRARY_REALNAME}\n";
+               if (defined($ctx->{ALIASES})) {
+                       foreach (@{$ctx->{ALIASES}}) {
+                               $self->{install_plugins} .= "\t\@rm -f \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$_.\$(SHLIBEXT)\n";
+                               $self->{install_plugins} .= "\t\@ln -fs $ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$_.\$(SHLIBEXT)\n";
+                               $self->{uninstall_plugins} .= "\t\@-rm \$(DESTDIR)\$(modulesdir)/$sane_subsystem/$_.\$(SHLIBEXT)\n";
+                       }
+               }
        }
 
+       $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
        $self->_prepare_list($ctx, "OBJ_LIST");
-       $self->_prepare_list($ctx, "CFLAGS");
+       $self->_prepare_list($ctx, "FULL_OBJ_LIST");
        $self->_prepare_list($ctx, "DEPEND_LIST");
-       $self->_prepare_list($ctx, "LINK_LIST");
        $self->_prepare_list($ctx, "LINK_FLAGS");
 
-       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
+       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
 
-       if ($ctx->{NOPROTO} eq "NO") {
-               push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
-       }
-
-       if ($ctx->{TYPE} eq "MODULE" and defined($ctx->{INIT_FUNCTION})) {
+       if (defined($ctx->{INIT_FUNCTION}) and $ctx->{TYPE} ne "PYTHON") {
                my $init_fn = $ctx->{INIT_FUNCTION_TYPE};
                $init_fn =~ s/\(\*\)/init_module/;
                my $proto_fn = $ctx->{INIT_FUNCTION_TYPE};
@@ -305,135 +214,110 @@ bin/$ctx->{NAME}_init_module.c:
        \@echo Creating \$\@
        \@echo \"#include \\\"includes.h\\\"\" > \$\@
        \@echo \"$proto_fn;\" >> \$\@
-       \@echo -e \"_PUBLIC_ $init_fn \\n{\\n\\treturn $ctx->{INIT_FUNCTION}();\\n}\\n\" >> \$\@
+       \@echo \"_PUBLIC_ $init_fn\" >> \$\@
+       \@echo \"{\" >> \$\@
+       \@echo \"       return $ctx->{INIT_FUNCTION}();\" >> \$\@
+       \@echo \"}\" >> \$\@
+       \@echo \"\" >> \$\@
 __EOD__
 );
                $init_obj = "bin/$ctx->{NAME}_init_module.o";
        }
 
-       if ($self->{duplicate_build}) {
-               $self->output(<< "__EOD__"
-#
-
-bin/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
-       \@echo Linking \$\@
-       \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
-               \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \\
-               $init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
-
-__EOD__
-);
-               if (defined($ctx->{LIBRARY_SONAME})) {
-                       $self->output(<< "__EOD__"
-# Symlink $ctx->{LIBRARY_SONAME}
-bin/$ctx->{LIBRARY_SONAME}: bin/$ctx->{LIBRARY_REALNAME} 
-       \@echo Symlink \$\@
-       \@ln -sf $ctx->{LIBRARY_REALNAME} \$\@
-# Symlink $ctx->{LIBRARY_NAME}
-bin/$ctx->{LIBRARY_NAME}: bin/$ctx->{LIBRARY_SONAME} 
-       \@echo Symlink \$\@
-       \@ln -sf $ctx->{LIBRARY_SONAME} \$\@
-
-__EOD__
-);
-               }
-       }
-
        $self->output(<< "__EOD__"
 #
 
-$installdir/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
+$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $init_obj
        \@echo Linking \$\@
-       \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\
-               \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \\
-               $init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
-
+       \@mkdir -p $ctx->{SHAREDDIR}
+       \@\$(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__
 );
-       if (defined($ctx->{LIBRARY_SONAME})) {
-           $self->output(<< "__EOD__"
-# Symlink $ctx->{LIBRARY_SONAME}
-$installdir/$ctx->{LIBRARY_SONAME}: $installdir/$ctx->{LIBRARY_REALNAME}
-       \@echo Symlink \$\@
-       \@ln -sf $ctx->{LIBRARY_REALNAME} \$\@
-# Symlink $ctx->{LIBRARY_NAME}
-$installdir/$ctx->{LIBRARY_NAME}: $installdir/$ctx->{LIBRARY_SONAME}
-       \@echo Symlink \$\@
-       \@ln -sf $ctx->{LIBRARY_SONAME} \$\@
 
-__EOD__
-);
+       if (defined($ctx->{ALIASES})) {
+               foreach (@{$ctx->{ALIASES}}) {
+                       $self->output("\t\@rm -f $ctx->{SHAREDDIR}/$_.\$(SHLIBEXT)\n");
+                       $self->output("\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$_.\$(SHLIBEXT)\n");
+               }
        }
+       $self->output("\n");
 }
 
-sub MergedObj($$)
+sub SharedLibrary($$)
 {
        my ($self,$ctx) = @_;
 
-       return unless $ctx->{TARGET};
-
-       $self->_prepare_list($ctx, "OBJ_LIST");
-       $self->_prepare_list($ctx, "CFLAGS");
-       $self->_prepare_list($ctx, "DEPEND_LIST");
+       my $has_static_lib = 0;
 
-       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
-               
-       if ($ctx->{NOPROTO} eq "NO") {
-               push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
-       }
+       push (@{$self->{shared_libs}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
+       push (@{$self->{installable_shared_libs}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
 
-       $self->output("$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n");
+       $has_static_lib = 1 if grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}});
 
-       $self->output("\t\@echo \"Pre-Linking $ctx->{TYPE} $ctx->{NAME}\"\n");
-       $self->output("\t@\$(LD) -r \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) -o $ctx->{TARGET}\n");
-       $self->output("\n");
-}
+       if (not $has_static_lib) {
+               $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
+               $self->_prepare_list($ctx, "OBJ_LIST");
+               $self->_prepare_list($ctx, "FULL_OBJ_LIST");
+       }
+       $self->_prepare_list($ctx, "DEPEND_LIST");
+       $self->_prepare_list($ctx, "LINK_FLAGS");
+#      $self->_prepare_list_ex($ctx, "LINK_FLAGS", "-Wl,--whole-archive", "-Wl,--no-whole-archive");
 
-sub ObjList($$)
-{
-       my ($self,$ctx) = @_;
+       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
 
-       return unless $ctx->{TARGET};
+       my $soarg = "";
+       my $lns = "";
+       if ($self->{config}->{SONAMEFLAG} ne "#" and defined($ctx->{LIBRARY_SONAME})) {
+               $soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME}";
+               if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
+                       $lns .= "\n\t\@rm -f $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
+                       $lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
+               }
+       }
 
-       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
-               
-       if ($ctx->{NOPROTO} eq "NO") {
-               push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
+       if (defined($ctx->{LIBRARY_SONAME})) {
+               $lns .= "\n\t\@rm -f $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}";
+               $lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}";
        }
 
-       $self->_prepare_list($ctx, "OBJ_LIST");
-       $self->_prepare_list($ctx, "CFLAGS");
-       $self->_prepare_list($ctx, "DEPEND_LIST");
-       $self->output("$ctx->{TARGET}: ");
-       $self->output("\$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n");
-       $self->output("\t\@touch $ctx->{TARGET}\n");
+       $self->output(<< "__EOD__"
+#
+
+$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) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+               \$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) \\
+               \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \\
+               $soarg$lns
+__EOD__
+);
+       $self->output("\n");
 }
 
 sub StaticLibrary($$)
 {
        my ($self,$ctx) = @_;
 
-       push (@{$self->{static_libs}}, $ctx->{OUTPUT});
+       return unless (defined($ctx->{OBJ_FILES}));
+
+       push (@{$self->{static_libs}}, $ctx->{TARGET_STATIC_LIBRARY}) if ($ctx->{TYPE} eq "LIBRARY");
 
+       $self->output("$ctx->{TYPE}_$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
        $self->_prepare_list($ctx, "OBJ_LIST");
-       $self->_prepare_list($ctx, "CFLAGS");
+       $self->_prepare_list($ctx, "FULL_OBJ_LIST");
 
-       $self->_prepare_list($ctx, "DEPEND_LIST");
-       $self->_prepare_list($ctx, "LINK_LIST");
-       $self->_prepare_list($ctx, "LINK_FLAGS");
-
-       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
-               
-       if ($ctx->{NOPROTO} eq "NO") {
-               push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
-       }
+       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
 
        $self->output(<< "__EOD__"
 #
-$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) 
+$ctx->{TARGET_STATIC_LIBRARY}: \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
        \@echo Linking \$@
-       \@\$(STLD) \$(STLD_FLAGS) \$@ \\
-               \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
+       \@rm -f \$@
+       \@mkdir -p $ctx->{STATICDIR}
+       \@\$(STLD) \$(STLD_FLAGS) \$@ \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
 
 __EOD__
 );
@@ -444,7 +328,7 @@ sub Header($$)
        my ($self,$ctx) = @_;
 
        foreach (@{$ctx->{PUBLIC_HEADERS}}) {
-               push (@{$self->{headers}}, "$ctx->{BASEDIR}/$_");
+               push (@{$self->{headers}}, output::add_dir_str($ctx->{BASEDIR}, $_));
        }
 }
 
@@ -453,19 +337,14 @@ sub Binary($$)
        my ($self,$ctx) = @_;
 
        my $installdir;
-       
-       if ($self->{duplicate_build}) {
-               $installdir = "bin/install";
-       } else {
-               $installdir = "bin";
-       }
+       my $extradir = "";
 
-       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
-               
-       if ($ctx->{NOPROTO} eq "NO") {
-               push(@{$self->{proto_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST\)");
-       }
+       my $localdir = "bin$extradir";
+
+       $installdir = "bin$extradir";
 
+       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
+               
        unless (defined($ctx->{INSTALLDIR})) {
        } elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
                push (@{$self->{sbin_progs}}, "$installdir/$ctx->{BINARY}");
@@ -473,98 +352,94 @@ sub Binary($$)
                push (@{$self->{bin_progs}}, "$installdir/$ctx->{BINARY}");
        }
 
-       push (@{$self->{binaries}}, "bin/$ctx->{BINARY}");
+       push (@{$self->{binaries}}, "$localdir/$ctx->{BINARY}");
 
        $self->_prepare_list($ctx, "OBJ_LIST");
-       $self->_prepare_list($ctx, "CFLAGS");
+       $self->_prepare_list($ctx, "FULL_OBJ_LIST");
        $self->_prepare_list($ctx, "DEPEND_LIST");
-       $self->_prepare_list($ctx, "LINK_LIST");
        $self->_prepare_list($ctx, "LINK_FLAGS");
 
-       if ($self->{duplicate_build}) {
-       $self->output(<< "__EOD__"
-#
-bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)
+$self->output(<< "__EOD__"
+$installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
        \@echo Linking \$\@
-       \@\$(CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
-               \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) \\
-               \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS)
-
 __EOD__
-);
-       }
+       );
 
-$self->output(<< "__EOD__"
-$installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)
-       \@echo Linking \$\@
-       \@\$(CC) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
-               \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) \\
+       if (defined($ctx->{USE_HOSTCC}) && $ctx->{USE_HOSTCC} eq "YES") {
+               $self->output(<< "__EOD__"
+       \@\$(HOSTLD) \$(HOSTLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+               \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS)
+__EOD__
+               );
+       } else {
+               $self->output(<< "__EOD__"
+       \@\$(BNLD) \$(BNLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
                \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
 
 __EOD__
-);
+               );
+       }
 }
 
-sub Manpage($$)
+sub PythonFiles($$)
 {
        my ($self,$ctx) = @_;
 
-       my $dir = $ctx->{BASEDIR};
-       
-       $dir =~ s/^\.\///g;
-
-       push (@{$self->{manpages}}, "$dir/$ctx->{MANPAGE}");
+       foreach (@{$ctx->{PYTHON_FILES}}) {
+               my $target = "bin/python/".basename($_);
+               my $source = output::add_dir_str($ctx->{BASEDIR}, $_);
+               $self->output("$target: $source\n" .
+                                         "\tmkdir -p \$(builddir)/bin/python\n" .
+                             "\tcp $source \$@\n\n");
+               push (@{$self->{python_pys}}, $target);
+       }
 }
 
-sub PkgConfig($$)
+sub Manpage($$)
 {
        my ($self,$ctx) = @_;
-       
-       my $link_name = $ctx->{NAME};
-
-       $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);
-
-       smb_build::env::PkgConfig($self,
-               $path,
-               $link_name,
-               $ctx->{OUTPUT},
-               join(' ', @{$ctx->{CFLAGS}}), 
-               "$ctx->{MAJOR_VERSION}.$ctx->{MINOR_VERSION}.$ctx->{RELEASE_VERSION}",
-               $ctx->{DESCRIPTION}
-       ); 
+       my $path = output::add_dir_str($ctx->{BASEDIR}, $ctx->{MANPAGE});
+       push (@{$self->{manpages}}, $path);
 }
 
 sub ProtoHeader($$)
 {
        my ($self,$ctx) = @_;
 
-       my $dir = $ctx->{BASEDIR};
+       my $target = "";
+       my $comment = "Creating ";
+
+       my $priv = undef;
+       my $pub = undef;
 
-       $dir =~ s/^\.\///g;
+       if (defined($ctx->{PRIVATE_PROTO_HEADER})) {
+               $priv = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PRIVATE_PROTO_HEADER});
+               $target .= $priv;
+               $comment .= $priv;
+               if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
+                       $comment .= " and ";
+                       $target.= " ";
+               }
+               push (@{$self->{proto_headers}}, $priv);
+       } else {
+               $ctx->{PRIVATE_PROTO_HEADER} = $ctx->{PUBLIC_PROTO_HEADER};
+               $priv = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PRIVATE_PROTO_HEADER});
+       }
 
-       my $comment = "";
        if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
-               $comment.= " and $dir/$ctx->{PUBLIC_PROTO_HEADER}";
-               push (@{$self->{proto_headers}}, "$dir/$ctx->{PUBLIC_PROTO_HEADER}");
+               $pub = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PUBLIC_PROTO_HEADER});
+               $comment .= $pub;
+               $target .= $pub;
+               push (@{$self->{proto_headers}}, $pub);
        } else {
                $ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};
-       }       
-       push (@{$self->{proto_headers}}, "$dir/$ctx->{PRIVATE_PROTO_HEADER}");
-
-       $self->output("$dir/$ctx->{PUBLIC_PROTO_HEADER}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)\n");
-       $self->output("\t\@echo \"Creating $dir/$ctx->{PRIVATE_PROTO_HEADER}$comment\"\n");
+               $pub = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PUBLIC_PROTO_HEADER});
+       }
 
-       $self->output("\t\@\$(PERL) \$(srcdir)/script/mkproto.pl --private=$dir/$ctx->{PRIVATE_PROTO_HEADER} --public=$dir/$ctx->{PUBLIC_PROTO_HEADER} \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n\n");
+       $self->output("$pub: $ctx->{MK_FILE} \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c) \$(srcdir)/script/mkproto.pl\n");
+       $self->output("\t\@echo \"$comment\"\n");
+       $self->output("\t\@\$(PERL) \$(srcdir)/script/mkproto.pl --srcdir=\$(srcdir) --builddir=\$(builddir) --private=$priv --public=$pub \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n\n");
 }
 
 sub write($$)
@@ -577,10 +452,12 @@ 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("PYTHON_DSOS = " . array2oneperline($self->{python_dsos}) . "\n");
+       $self->output("PYTHON_PYS = " . array2oneperline($self->{python_pys}) . "\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");
-       $self->output("PROTO_OBJS = " . array2oneperline($self->{proto_objs}) .  "\n");
        $self->output("PROTO_HEADERS = " . array2oneperline($self->{proto_headers}) .  "\n");
        $self->output("SHARED_MODULES = " . array2oneperline($self->{shared_modules}) . "\n");
        $self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n");
@@ -590,19 +467,30 @@ sub write($$)
 
        $self->_prepare_mk_files();
 
-       if ($self->{developer}) {
-               $self->output(<<__EOD__
-
-#-include \$(ALL_OBJS:.o=.d)
+       $self->output($self->{mkfile});
 
-__EOD__
-);
+       if ($self->{automatic_deps}) {
+               $self->output("
+ifneq (\$(MAKECMDGOALS),clean)
+ifneq (\$(MAKECMDGOALS),distclean)
+ifneq (\$(MAKECMDGOALS),realdistclean)
+ifneq (\$(SKIP_DEP_FILES),yes)
+-include \$(DEP_FILES)
+endif
+endif
+endif
+endif
+
+ifneq (\$(SKIP_DEP_FILES),yes)
+clean::
+       \@echo Removing dependency files
+       \@find . -name '*.d' -o -name '*.hd' | xargs rm -f
+endif
+");
+       } else {
+               $self->output("include \$(srcdir)/static_deps.mk\n");
        }
 
-       $self->_prepare_dummy_MAKEDIR();
-
-       $self->output($self->{mkfile});
-
        open(MAKEFILE,">$file") || die ("Can't open $file\n");
        print MAKEFILE $self->{output};
        close(MAKEFILE);