[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1177-g1e786bb

Jelmer Vernooij jelmer at samba.org
Fri Feb 29 14:41:55 GMT 2008


The branch, v4-0-test has been updated
       via  1e786bb7da689c3aa435e92975f33db5a308b6a7 (commit)
       via  58a93ef94b878ff2d2d0029fc2d443551842e712 (commit)
       via  46d8d02028869c97226648113d6bff1c06477d61 (commit)
       via  dfb4ddcd5dbd27d275e7a41ede5441be25db9a35 (commit)
       via  52eb2397387c62a1c5e52ce4ae217adca2c2eb1b (commit)
      from  18c683d7e804e76ac37d4069429b5ba1a9d9ae38 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 1e786bb7da689c3aa435e92975f33db5a308b6a7
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Feb 16 20:24:47 2008 +0100

    Simpler handling of sonameflag.

commit 58a93ef94b878ff2d2d0029fc2d443551842e712
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 25 18:05:47 2008 +0100

    Move automatic dependencies code out of perl code.

commit 46d8d02028869c97226648113d6bff1c06477d61
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 25 17:20:33 2008 +0100

    Allow absolute paths to be specified to mkproto.pl.

commit dfb4ddcd5dbd27d275e7a41ede5441be25db9a35
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Feb 29 15:39:18 2008 +0100

    Use special make variables.

commit 52eb2397387c62a1c5e52ce4ae217adca2c2eb1b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Feb 26 16:55:08 2008 +0100

    Ignore autogenerated file.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                         |    1 +
 source/Makefile                    |   30 +++++++++++++++++-
 source/build/smb_build/makefile.pm |   60 +++++------------------------------
 source/librpc/config.mk            |    6 ++--
 source/rules.mk                    |    3 --
 source/script/mkproto.pl           |    4 ++-
 6 files changed, 45 insertions(+), 59 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index f75f698..3a2e564 100644
--- a/.gitignore
+++ b/.gitignore
@@ -197,3 +197,4 @@ source/apidocs
 *.swp
 source/mkconfig.mk
 source/data.mk
+source/librpc/idl-deps
diff --git a/source/Makefile b/source/Makefile
index 1fddfef..97518eb 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -19,11 +19,39 @@ BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
 HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
 HOSTLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
 
-default: all
+.DEFAULT_GOAL := all
+
+ifneq ($(automatic_deps),yes)
+ALL_PREDEP = proto
+.NOTPARALLEL:
+endif
 
 include rules.mk
 include data.mk
 
+DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
+		   include/includes.d
+
+ifeq ($(automatic_deps),yes)
+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
+include $(srcdir)/static_deps.mk
+endif
+
 DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
 		  $(srcdir)/version.h
 
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index c5cc3d3..52bd5ed 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -30,11 +30,6 @@ sub new($$$)
 	$self->output("################################################\n");
 	$self->output("\n");
 
-	if (!$self->{automatic_deps}) {
-		$self->output("ALL_PREDEP = proto\n");
-		$self->output(".NOTPARALLEL:\n");
-	}
-
 	return $self;
 }
 
@@ -78,23 +73,17 @@ sub _prepare_mk_files($)
 		push (@tmp, $_);
 	}
 
-	if ($self->{gnu_make}) {
-		$self->output("
+	$self->output("
 ifneq (\$(MAKECMDGOALS),clean)
 ifneq (\$(MAKECMDGOALS),distclean)
 ifneq (\$(MAKECMDGOALS),realdistclean)
 ");
-	}
-
 	$self->output("MK_FILES = " . array2oneperline(\@tmp) . "\n");
-
-	if ($self->{gnu_make}) {
-		$self->output("
+	$self->output("
 endif
 endif
 endif
 ");
-	}
 }
 
 sub array2oneperline($)
@@ -236,31 +225,22 @@ sub SharedLibrary($$)
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 	$self->_prepare_list($ctx, "LINK_FLAGS");
 
-	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\@test \$($ctx->{NAME}_VERSION) = \$($ctx->{NAME}_SOVERSION) || ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}";
-		}
-	}
-
-	$lns .= "\nifdef $ctx->{NAME}_SOVERSION";
-	$lns .= "\n\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}";
-	$lns .= "\nendif";
-
 	$self->output(<< "__EOD__"
-#
 $ctx->{RESULT_SHARED_LIBRARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
 	\@echo Linking \$\@
 	\@mkdir -p \$(\@D)
 	\@\$(SHLD) \$(LDFLAGS) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
 		\$($ctx->{NAME}\_FULL_OBJ_LIST) \\
 		\$($ctx->{NAME}_LINK_FLAGS) \\
-		$soarg$lns
+		\$(if \$(SONAMEFLAG), \$(SONAMEFLAG)$ctx->{LIBRARY_SONAME})
 __EOD__
 );
-	$self->output("\n");
+	if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
+		$self->output("\t\@test \$($ctx->{NAME}_VERSION) = \$($ctx->{NAME}_SOVERSION) || ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}\n");
+	}
+	$self->output("ifdef $ctx->{NAME}_SOVERSION\n");
+	$self->output("\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}\n");
+	$self->output("endif\n");
 }
 
 sub MergedObj($$)
@@ -369,28 +349,6 @@ sub write($$)
 
 	$self->output($self->{mkfile});
 
-	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");
-	}
-
 	open(MAKEFILE,">$file") || die ("Can't open $file\n");
 	print MAKEFILE $self->{output};
 	close(MAKEFILE);
diff --git a/source/librpc/config.mk b/source/librpc/config.mk
index e37bd4f..7abc693 100644
--- a/source/librpc/config.mk
+++ b/source/librpc/config.mk
@@ -297,9 +297,9 @@ clean::
 include librpc/idl-deps
 
 librpc/gen_ndr/tables.c: $(IDL_NDR_PARSE_H_FILES)
-	@echo Generating librpc/gen_ndr/tables.c
-	@$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_PARSE_H_FILES) > librpc/gen_ndr/tables.x
-	mv librpc/gen_ndr/tables.x librpc/gen_ndr/tables.c
+	@echo Generating $@
+	@$(PERL) $(srcdir)/librpc/tables.pl --output=$@ $^ > librpc/gen_ndr/tables.x
+	@mv librpc/gen_ndr/tables.x $@
 
 [SUBSYSTEM::NDR_TABLE]
 OBJ_FILES = ndr/ndr_table.o gen_ndr/tables.o
diff --git a/source/rules.mk b/source/rules.mk
index d0be997..5f91f81 100644
--- a/source/rules.mk
+++ b/source/rules.mk
@@ -162,9 +162,6 @@ DOCBOOK_MANPAGE_URL = http://docbook.sourceforge.net/release/xsl/current/manpage
 .8.xml.8:
 	$(XSLTPROC) -o $@ $(DOCBOOK_MANPAGE_URL) $<
 
-DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
-		   include/includes.d
-
 dist:: idl_full manpages configure distclean 
 
 configure: 
diff --git a/source/script/mkproto.pl b/source/script/mkproto.pl
index 5aeece7..87a68e3 100755
--- a/source/script/mkproto.pl
+++ b/source/script/mkproto.pl
@@ -157,7 +157,9 @@ sub process_file($$$)
 
 	$filename =~ s/\.o$/\.c/g;
 
-	if (!open(FH, "< $builddir/$filename")) {
+	if ($filename =~ /^\//) {
+		open(FH, "<$filename") or die("Failed to open $filename");
+	} elsif (!open(FH, "< $builddir/$filename")) {
 	    open(FH, "< $srcdir/$filename") || die "Failed to open $filename";
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list