r14606: Fix paths in developer mode. This allows 'make quicktest' to work when
[ira/wip.git] / source / build / smb_build / makefile.pm
index c0b9e36e4f049e8ef131c55c3047ea61b5e371dc..ec306c2bb7215d6456480a610dba2ede4b2a5d85 100644 (file)
@@ -1,11 +1,9 @@
-###########################################################
-### SMB Build System                                   ###
-### - create output for Makefile                       ###
-###                                                    ###
-###  Copyright (C) Stefan (metze) Metzmacher 2004      ###
-###  Copyright (C) Jelmer Vernooij 2005                        ###
-###  Released under the GNU GPL                                ###
-###########################################################
+# Samba Build System
+# - create output for Makefile
+#
+#  Copyright (C) Stefan (metze) Metzmacher 2004
+#  Copyright (C) Jelmer Vernooij 2005
+#  Released under the GNU GPL
 
 package smb_build::makefile;
 use smb_build::env;
@@ -13,9 +11,9 @@ use strict;
 
 use base 'smb_build::env';
 
-sub new($$$$)
+sub new($$$)
 {
-       my ($myname, $config, $CTX, $mkfile) = @_;
+       my ($myname, $config, $mkfile) = @_;
        my $self = new smb_build::env($config);
        
        bless($self, $myname);
@@ -25,49 +23,32 @@ sub new($$$$)
        $self->{bin_progs} = [];
        $self->{static_libs} = [];
        $self->{shared_libs} = [];
+       $self->{installable_shared_libs} = [];
        $self->{headers} = [];
+       $self->{shared_modules} = [];
+       $self->{plugins} = [];
+       $self->{install_plugins} = "";
+       $self->{uninstall_plugins} = "";
        $self->{pc_files} = [];
+       $self->{proto_headers} = [];
        $self->{output} = "";
 
        $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");
 
+       if (!$self->{automatic_deps}) {
+               $self->output("ALL_PREDEP = proto\n");
+       }
+
        $self->output("default: all\n\n");
 
        $self->_prepare_path_vars();
        $self->_prepare_compiler_linker();
-       $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");
-
-       $self->_prepare_mk_files();
-
-       $self->_prepare_dummy_MAKEDIR($CTX);
-
-       foreach my $key (values %$CTX) {
-               if (defined($key->{OBJ_LIST})) {
-                       $self->_prepare_obj_list($key->{TYPE}, $key);
-                       $self->_prepare_cflags($key->{TYPE}, $key);
-               }
-       }
-       
-       foreach my $key (values %$CTX) {
-               next unless defined $key->{OUTPUT_TYPE};
-
-               $self->MergedObj($key) if $key->{OUTPUT_TYPE} eq "MERGEDOBJ";
-               $self->ObjList($key) if $key->{OUTPUT_TYPE} eq "OBJLIST";
-               $self->StaticLibrary($key) if $key->{OUTPUT_TYPE} eq "STATIC_LIBRARY";
-               $self->PkgConfig($key) if ($key->{OUTPUT_TYPE} eq "SHARED_LIBRARY") and
-                                                       defined($key->{MAJOR_VERSION});
-               $self->SharedLibrary($key) if $key->{OUTPUT_TYPE} eq "SHARED_LIBRARY";
-               $self->Binary($key) if $key->{OUTPUT_TYPE} eq "BINARY";
-               $self->Manpage($key) if defined($key->{MANPAGE});
-               $self->Header($key) if defined($key->{PUBLIC_HEADERS});
-       }
 
        return $self;
 }
@@ -87,19 +68,21 @@ sub _prepare_path_vars($)
 prefix = $self->{config}->{prefix}
 exec_prefix = $self->{config}->{exec_prefix}
 selftest_prefix = $self->{config}->{selftest_prefix}
-VPATH = $self->{config}->{srcdir}
+VPATH = $self->{config}->{srcdir}:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken
 srcdir = $self->{config}->{srcdir}
 builddir = $self->{config}->{builddir}
 
 BASEDIR = $self->{config}->{prefix}
 BINDIR = $self->{config}->{bindir}
 SBINDIR = $self->{config}->{sbindir}
-datadir = $self->{config}->{datadir}
 LIBDIR = $self->{config}->{libdir}
+MODULESDIR = $self->{config}->{modulesdir}
 INCLUDEDIR = $self->{config}->{includedir}
-CONFIGDIR = $self->{config}->{configdir}
-localstatedir = $self->{config}->{localstatedir}
-SWATDIR = $self->{config}->{swatdir}
+CONFIGDIR = $self->{config}->{sysconfdir}
+DATADIR = $self->{config}->{datadir}
+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
@@ -107,6 +90,7 @@ 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__
 );
@@ -116,28 +100,42 @@ sub _prepare_compiler_linker($)
 {
        my ($self) = @_;
 
+       my $devld_local = "";
+       my $devld_install = "";
+
+       $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";
+       }
+
        $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} $self->{config}->{CPPFLAGS}
+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}
 
-CPP=$self->{config}->{CPP}
-CPPFLAGS=$self->{config}->{CPPFLAGS}
+LOCAL_LINK_FLAGS=$devld_local
+INSTALL_LINK_FLAGS=$devld_install
 
-LD=$self->{config}->{LD}
-LD_FLAGS=$self->{config}->{LDFLAGS} 
+LD=$self->{config}->{LD} 
+LDFLAGS=$self->{config}->{LDFLAGS} -L\$(builddir)/bin
 
 STLD=$self->{config}->{AR}
-STLD_FLAGS=-rc
+STLD_FLAGS=-rc -L\$(builddir)/bin
 
 SHLD=$self->{config}->{CC}
-SHLD_FLAGS=$self->{config}->{LDSHFLAGS}
-SONAMEFLAG=$self->{config}->{SONAMEFLAG}
+SHLD_FLAGS=$self->{config}->{LDSHFLAGS} -L\$(builddir)/bin
 SHLIBEXT=$self->{config}->{SHLIBEXT}
 
 XSLTPROC=$self->{config}->{XSLTPROC}
@@ -169,60 +167,6 @@ sub _prepare_mk_files($)
        $self->output("MK_FILES = " . array2oneperline(\@tmp) . "\n");
 }
 
-sub _prepare_dummy_MAKEDIR($$)
-{
-       my ($self,$ctx) = @_;
-
-       $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.sh \$\@` \$(CFLAGS) $flags -c \$< -o \$\@
-__EOD__
-);
-       if ($self->{config}->{BROKEN_CC} eq "yes") {
-               $self->output(' -mv `echo $@ | sed \'s%^.*/%%g\'` $@
-');
-       }
-
-       $self->output("\n");
-}
-
-sub _prepare_hostcc_rule($)
-{
-       my ($self) = @_;
-       
-       $self->output(<< "__EOD__"
-.c.ho:
-       \@echo Compiling \$\*.c with host compiler
-       \@\$(HOSTCC) `script/cflags.sh \$\@` \$(CFLAGS) -c \$< -o \$\@
-__EOD__
-);
-       if ($self->{config}->{BROKEN_CC} eq "yes") {
-               $self->output(' -mv `echo $@ | sed \'s%^.*/%%g\' -e \'s%\.ho$$%.o%\'` $@
-');
-       }
-
-       $self->output("\n");
-}
-
 sub array2oneperline($)
 {
        my $array = shift;
@@ -237,66 +181,116 @@ sub array2oneperline($)
        return $output;
 }
 
-sub _prepare_obj_list($$$)
+sub _prepare_list($$$)
 {
-       my ($self,$var,$ctx) = @_;
+       my ($self,$ctx,$var) = @_;
 
-       my $tmplist = array2oneperline($ctx->{OBJ_LIST});
+       my $tmplist = array2oneperline($ctx->{$var});
        return if ($tmplist eq "");
 
-       $self->output("$var\_$ctx->{NAME}_OBJS =$tmplist\n");
+       $self->output("$ctx->{TYPE}\_$ctx->{NAME}_$var =$tmplist\n");
 }
 
-sub _prepare_cflags($$$)
+sub SharedLibrary($$)
 {
-       my ($self, $var,$ctx) = @_;
+       my ($self,$ctx) = @_;
 
-       my $tmplist = array2oneperline($ctx->{CFLAGS});
-       return if ($tmplist eq "");
+       my $installdir;
+       my $init_obj = "";
+       
+       if ($self->{duplicate_build}) {
+               $installdir = $ctx->{RELEASEDIR};
+       } else {
+               $installdir = $ctx->{DEBUGDIR};
+       }
 
-       $self->output("$var\_$ctx->{NAME}_CFLAGS =$tmplist\n");
-}
+       if ($ctx->{TYPE} eq "LIBRARY") {
+               push (@{$self->{shared_libs}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}");
+               push (@{$self->{installable_shared_libs}}, "$installdir/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
+       } elsif ($ctx->{TYPE} eq "MODULE") {
+               push (@{$self->{shared_modules}}, "$ctx->{DEBUGDIR}/$ctx->{FIXED_NAME}.\$(SHLIBEXT)");
+               push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
+
+               $self->{install_plugins} .= "\t\@echo Installing $installdir/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{FIXED_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->{FIXED_NAME}.\$(SHLIBEXT)\n";
+               $self->{uninstall_plugins} .= "\t\@echo Uninstalling \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{FIXED_NAME}.\$(SHLIBEXT)\n";
+               $self->{uninstall_plugins} .= "\t\@-rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{FIXED_NAME}.\$(SHLIBEXT)\n";
+               if (defined($ctx->{ALIASES})) {
+                       foreach (@{$ctx->{ALIASES}}) {
+                               $self->{install_plugins} .= "\t\@ln -s $ctx->{FIXED_NAME}.\$(SHLIBEXT) \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$_.\$(SHLIBEXT)\n";
+                               $self->{uninstall_plugins} .= "\t\@-rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$_.\$(SHLIBEXT)\n";
+                       }
+               }
+       }
 
-sub SharedLibrary($$)
-{
-       my ($self,$ctx) = @_;
+       $self->_prepare_list($ctx, "OBJ_LIST");
+       $self->_prepare_list($ctx, "CFLAGS");
+       $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->{TYPE} eq "MODULE" and defined($ctx->{INIT_FUNCTION})) {
+               my $init_fn = $ctx->{INIT_FUNCTION_TYPE};
+               $init_fn =~ s/\(\*\)/init_module/;
+               my $proto_fn = $ctx->{INIT_FUNCTION_TYPE};
+               $proto_fn =~ s/\(\*\)/$ctx->{INIT_FUNCTION}/;
+
+               $self->output(<< "__EOD__"
+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\" >> \$\@
+__EOD__
+);
+               $init_obj = "bin/$ctx->{NAME}_init_module.o";
+       }
 
-       push (@{$self->{shared_libs}}, $ctx->{OUTPUT});
+       my $soarg = "";
+       my $soargdebug = "";
+       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}) {
+                       $soargdebug = "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{DEBUGDIR}/$ctx->{LIBRARY_SONAME}";
+               }
+       }
 
-       my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
-       my $tmpshlink = array2oneperline($ctx->{LINK_LIST});
-       my $tmpshflag = array2oneperline($ctx->{LINK_FLAGS});
+       if ($self->{duplicate_build}) {
+               $self->output(<< "__EOD__"
+#
+
+$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
+       \@echo Linking \$\@
+       \@mkdir -p $ctx->{DEBUGDIR}
+       \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\
+               \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
+               $init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)$soargdebug
+__EOD__
+);
+               if (defined($ctx->{ALIASES})) {
+                       foreach (@{$ctx->{ALIASES}}) {
+                               $self->output("\t\@ln -s $ctx->{FIXED_NAME}.\$(SHLIBEXT) $ctx->{DEBUGDIR}/$_.\$(SHLIBEXT)\n");
+                       }
+               }
+
+               $self->output("\n");
+       }
 
        $self->output(<< "__EOD__"
-LIBRARY_$ctx->{NAME}_DEPEND_LIST =$tmpdepend
-LIBRARY_$ctx->{NAME}_SHARED_LINK_LIST =$tmpshlink
-LIBRARY_$ctx->{NAME}_SHARED_LINK_FLAGS =$tmpshflag
 #
 
-$ctx->{TARGET}: \$(LIBRARY_$ctx->{NAME}_DEPEND_LIST) \$(LIBRARY_$ctx->{NAME}_OBJS) bin/.dummy
+$installdir/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) $init_obj
        \@echo Linking \$\@
        \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\
-               \$(LIBRARY_$ctx->{NAME}_SHARED_LINK_FLAGS) \\
-               \$(LIBRARY_$ctx->{NAME}_SHARED_LINK_LIST)
-
-__EOD__
-);
-       if (defined($ctx->{LIBRARY_SONAME})) {
-           $self->output(<< "__EOD__"
-# Symlink $ctx->{LIBRARY_SONAME}
-bin/$ctx->{LIBRARY_SONAME}: bin/$ctx->{LIBRARY_REALNAME} bin/.dummy
-       \@echo Symlink \$\@
-       \@ln -sf $ctx->{LIBRARY_REALNAME} \$\@
-# Symlink $ctx->{LIBRARY_NAME}
-bin/$ctx->{LIBRARY_NAME}: bin/$ctx->{LIBRARY_SONAME} bin/.dummy
-       \@echo Symlink \$\@
-       \@ln -sf $ctx->{LIBRARY_SONAME} \$\@
+               \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\
+               $init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
 
 __EOD__
 );
-       }
-
-       $self->output("library_$ctx->{NAME}: basics bin/lib$ctx->{LIBRARY_NAME}\n");
 }
 
 sub MergedObj($$)
@@ -305,27 +299,32 @@ sub MergedObj($$)
 
        return unless $ctx->{TARGET};
 
-       my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
+       $self->_prepare_list($ctx, "OBJ_LIST");
+       $self->_prepare_list($ctx, "CFLAGS");
+       $self->_prepare_list($ctx, "DEPEND_LIST");
 
-       $self->output("$ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST = $tmpdepend\n");
-
-       $self->output("$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n");
+       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
+               
+       $self->output("$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n");
 
        $self->output("\t\@echo \"Pre-Linking $ctx->{TYPE} $ctx->{NAME}\"\n");
-       $self->output("\t@\$(LD) -r \$($ctx->{TYPE}_$ctx->{NAME}_OBJS) -o $ctx->{TARGET}\n");
+       $self->output("\t@\$(LD) -r \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) -o $ctx->{TARGET}\n");
        $self->output("\n");
 }
 
 sub ObjList($$)
 {
        my ($self,$ctx) = @_;
-       my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
 
        return unless $ctx->{TARGET};
 
-       $self->output("$ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST = $tmpdepend\n");
+       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
+               
+       $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}_OBJS)\n");
+       $self->output("\$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n");
        $self->output("\t\@touch $ctx->{TARGET}\n");
 }
 
@@ -335,21 +334,21 @@ sub StaticLibrary($$)
 
        push (@{$self->{static_libs}}, $ctx->{OUTPUT});
 
-       my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
-       my $tmpstlink = array2oneperline($ctx->{LINK_LIST});
-       my $tmpstflag = array2oneperline($ctx->{LINK_FLAGS});
+       $self->_prepare_list($ctx, "OBJ_LIST");
+       $self->_prepare_list($ctx, "CFLAGS");
+
+       $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)");
+               
        $self->output(<< "__EOD__"
-LIBRARY_$ctx->{NAME}_DEPEND_LIST =$tmpdepend
 #
-LIBRARY_$ctx->{NAME}_STATIC_LINK_LIST =$tmpstlink
-#
-$ctx->{TARGET}: \$(LIBRARY_$ctx->{NAME}_DEPEND_LIST) \$(LIBRARY_$ctx->{NAME}_OBJS) bin/.dummy
+$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) 
        \@echo Linking \$@
        \@\$(STLD) \$(STLD_FLAGS) \$@ \\
-               \$(LIBRARY_$ctx->{NAME}_STATIC_LINK_LIST)
-
-library_$ctx->{NAME}: basics $ctx->{TARGET}
+               \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
 
 __EOD__
 );
@@ -368,30 +367,50 @@ sub Binary($$)
 {
        my ($self,$ctx) = @_;
 
+       my $installdir;
+       
+       if ($self->{duplicate_build}) {
+               $installdir = "bin/install";
+       } else {
+               $installdir = "bin";
+       }
+
+       push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
+               
        unless (defined($ctx->{INSTALLDIR})) {
        } elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
-               push (@{$self->{sbin_progs}}, $ctx->{TARGET});
+               push (@{$self->{sbin_progs}}, "$installdir/$ctx->{BINARY}");
        } elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
-               push (@{$self->{bin_progs}}, $ctx->{TARGET});
+               push (@{$self->{bin_progs}}, "$installdir/$ctx->{BINARY}");
        }
 
-       my $tmpdepend = array2oneperline($ctx->{DEPEND_LIST});
-       my $tmplink = array2oneperline($ctx->{LINK_LIST});
-       my $tmpflag = array2oneperline($ctx->{LINK_FLAGS});
+       push (@{$self->{binaries}}, "bin/$ctx->{BINARY}");
+
+       $self->_prepare_list($ctx, "OBJ_LIST");
+       $self->_prepare_list($ctx, "CFLAGS");
+       $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__"
 #
-BINARY_$ctx->{NAME}_DEPEND_LIST =$tmpdepend
-BINARY_$ctx->{NAME}_LINK_LIST =$tmplink
-BINARY_$ctx->{NAME}_LINK_FLAGS =$tmpflag
-#
-bin/$ctx->{BINARY}: bin/.dummy \$(BINARY_$ctx->{NAME}_DEPEND_LIST) \$(BINARY_$ctx->{NAME}_OBJS)
+bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) 
        \@echo Linking \$\@
-       \@\$(CC) \$(LD_FLAGS) -o \$\@ \\
-               \$\(BINARY_$ctx->{NAME}_LINK_FLAGS) \\
-               \$\(BINARY_$ctx->{NAME}_LINK_LIST) \\
-               \$\(BINARY_$ctx->{NAME}_LINK_FLAGS)
-binary_$ctx->{BINARY}: basics bin/$ctx->{BINARY}
+       \@\$(CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \$(INSTALL_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) \\
+               \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
 
 __EOD__
 );
@@ -402,7 +421,7 @@ sub Manpage($$)
        my ($self,$ctx) = @_;
 
        my $dir = $ctx->{BASEDIR};
-
+       
        $dir =~ s/^\.\///g;
 
        push (@{$self->{manpages}}, "$dir/$ctx->{MANPAGE}");
@@ -412,11 +431,63 @@ sub PkgConfig($$)
 {
        my ($self,$ctx) = @_;
        
-       my $path = "$ctx->{BASEDIR}/$ctx->{NAME}.pc";
+       my $link_name = $ctx->{NAME};
+
+       $link_name =~ s/^LIB//g;
+       $link_name = lc($link_name);
+
+       return if (not defined($ctx->{DESCRIPTION}));
+
+       my $path = "$ctx->{BASEDIR}/$link_name.pc";
 
        push (@{$self->{pc_files}}, $path);
 
-       smb_build::env::PkgConfig($self,$path,$ctx->{NAME},"FIXME",join(' ', @{$ctx->{CFLAGS}}), "$ctx->{MAJOR_VERSION}.$ctx->{MINOR_VERSION}.$ctx->{RELEASE_VERSION}"); 
+       smb_build::env::PkgConfig($self,
+               $path,
+               $link_name,
+               "-l$link_name",
+               "",
+               "$ctx->{VERSION}",
+               $ctx->{DESCRIPTION},
+               defined($ctx->{INIT_FUNCTIONS})
+       ); 
+}
+
+sub ProtoHeader($$)
+{
+       my ($self,$ctx) = @_;
+
+       my $dir = $ctx->{BASEDIR};
+
+       $dir =~ s/^\.\///g;
+
+       my $target = "";
+
+       my $comment = "Creating ";
+       if (defined($ctx->{PRIVATE_PROTO_HEADER})) {
+               $target.= "$dir/$ctx->{PRIVATE_PROTO_HEADER}";
+               $comment.= "$dir/$ctx->{PRIVATE_PROTO_HEADER}";
+               if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
+                       $comment .= " and ";
+                       $target.= " ";
+               }
+               push (@{$self->{proto_headers}}, "$dir/$ctx->{PRIVATE_PROTO_HEADER}");
+       } else {
+               $ctx->{PRIVATE_PROTO_HEADER} = $ctx->{PUBLIC_PROTO_HEADER};
+       }
+       
+       if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
+               $comment.= "$dir/$ctx->{PUBLIC_PROTO_HEADER}";
+               $target .= "$dir/$ctx->{PUBLIC_PROTO_HEADER}";
+               push (@{$self->{proto_headers}}, "$dir/$ctx->{PUBLIC_PROTO_HEADER}");
+       } else {
+               $ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};
+       }       
+
+       $self->output("$dir/$ctx->{PUBLIC_PROTO_HEADER}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)\n");
+       $self->output("\t\@echo \"$comment\"\n");
+
+       $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");
 }
 
 sub write($$)
@@ -426,24 +497,44 @@ sub write($$)
        $self->output("MANPAGES = ".array2oneperline($self->{manpages})."\n");
        $self->output("BIN_PROGS = " . array2oneperline($self->{bin_progs}) . "\n");
        $self->output("SBIN_PROGS = " . array2oneperline($self->{sbin_progs}) . "\n");
+       $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("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");
-
-       if ($self->{developer}) {
-               $self->output(<<__EOD__
-#-include \$(_ALL_OBJS_OBJS:.o=.d)
-IDL_FILES = \$(wildcard librpc/idl/*.idl)
-\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%.c,\$(IDL_FILES)) \\
-\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_\%_c.c,\$(IDL_FILES)) \\
-\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%.h,\$(IDL_FILES)): idl
-__EOD__
-);
+       $self->output("ALL_OBJS = " . array2oneperline($self->{all_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");
+
+       $self->output("\ninstallplugins: \$(PLUGINS)\n".$self->{install_plugins}."\n");
+       $self->output("\nuninstallplugins:\n".$self->{uninstall_plugins}."\n");
+
+       # nasty hack to allow running locally
+       if ($self->{duplicate_build}) {
+               $self->output("bin/libdynconfig.\$(SHLIBEXT).0.0.1: dynconfig-devel.o\n");
+               $self->output("bin/libdynconfig.\$(SHLIBEXT).0.0.1: LIBRARY_DYNCONFIG_OBJ_LIST=dynconfig-devel.o\n");
        }
 
+       $self->_prepare_mk_files();
+
        $self->output($self->{mkfile});
 
+       if ($self->{automatic_deps}) {
+               $self->output("
+ifneq (\$(MAKECMDGOALS),clean)
+ifneq (\$(MAKECMDGOALS),distclean)
+ifneq (\$(MAKECMDGOALS),realdistclean)
+-include \$(DEP_FILES)
+endif
+endif
+endif
+");
+       } else {
+               $self->output("include static_deps.mk\n");
+       }
+
        open(MAKEFILE,">$file") || die ("Can't open $file\n");
        print MAKEFILE $self->{output};
        close(MAKEFILE);