svn commit: samba r7307 - in branches/SAMBA_4_0/source/build/smb_build: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-06-05 13:52:11 +0000 (Sun, 05 Jun 2005)
New Revision: 7307

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7307

Log:
Add phony rules for OUTPUT_TYPE OBJLIST, e.g. it is now possible 
to do things like:

make SUBSYSTEM_NDR_RAW

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-06-05 13:41:32 UTC (rev 7306)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-06-05 13:52:11 UTC (rev 7307)
@@ -87,7 +87,7 @@
 
 	$output = << '__EOD__';
 CC=@CC@
-CC_FLAGS=-Iinclude -I. -I$(srcdir)/include -I$(srcdir) -D_SAMBA_BUILD_ -DHAVE_CONFIG_H -Ilib @CFLAGS@ @CPPFLAGS@
+CFLAGS=-Iinclude -I. -I$(srcdir)/include -I$(srcdir) -D_SAMBA_BUILD_ -DHAVE_CONFIG_H -Ilib @CFLAGS@ @CPPFLAGS@
 
 LD=@CC@
 LD_FLAGS=@LDFLAGS@ @CFLAGS@ -Lbin
@@ -194,7 +194,7 @@
 
 dynconfig.o: dynconfig.c Makefile
 	@echo Compiling $*.c
-	@$(CC) $(CC_FLAGS) @PICFLAG@ $(PATH_FLAGS) -c $< -o $@
+	@$(CC) $(CFLAGS) @PICFLAG@ $(PATH_FLAGS) -c $< -o $@
 @BROKEN_CC@	-mv `echo $@ | sed 's%^.*/%%g'` $@
 
 __EOD__
@@ -233,7 +233,7 @@
 # Start $comment
 .$src.$dst:
 	\@echo $message \$\*.$src
-	\@\$(CC) \$(TARGET_CFLAGS) \$(CC_FLAGS) $flags -c \$< -o \$\@
+	\@\$(CC) \$(TARGET_CFLAGS) \$(CFLAGS) $flags -c \$< -o \$\@
 \@BROKEN_CC\@	-mv `echo \$\@ | sed 's%^.*/%%g'` \$\@
 #End $comment
 ###################################
@@ -405,6 +405,12 @@
 	return $output;
 }
 
+sub _prepare_objlist_rule($)
+{
+	my $t = shift;
+	return "$t->{TYPE}_$t->{NAME}: \$($t->{TYPE}_$t->{NAME}_OBJS)\n";
+}
+
 ###########################################################
 # This function creates a make rule for linking a library
 #
@@ -632,7 +638,7 @@
 
 showflags:
 	@echo "Samba will be compiled with flags:"
-	@echo "  CC_FLAGS = $(CC_FLAGS)"
+	@echo "  CFLAGS = $(CFLAGS)"
 	@echo "  LD_FLAGS = $(LD_FLAGS)"
 	@echo "  STLD_FLAGS = $(STLD_FLAGS)"
 	@echo "  SHLD_FLAGS = $(SHLD_FLAGS)"
@@ -752,6 +758,7 @@
 
 	foreach my $key (values %{$depend}) {
 		next if not defined $key->{OUTPUT_TYPE};
+		($output .= _prepare_objlist_rule($key)) if $key->{OUTPUT_TYPE} eq "OBJLIST";
 		($output .= _prepare_static_library_rule($key)) if $key->{OUTPUT_TYPE} eq "STATIC_LIBRARY";
 		($output .= _prepare_shared_library_rule($key)) if $key->{OUTPUT_TYPE} eq "SHARED_LIBRARY";
 		($output .= _prepare_binary_rule($key)) if $key->{OUTPUT_TYPE} eq "BINARY";

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2005-06-05 13:41:32 UTC (rev 7306)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2005-06-05 13:52:11 UTC (rev 7307)
@@ -14,7 +14,8 @@
 {
 	my $subsys = shift;
 
-	$subsys->{TARGET} = $subsys->{OUTPUT} = "\$($subsys->{TYPE}_$subsys->{NAME}_OBJS)";
+	$subsys->{TARGET} = "$subsys->{TYPE}_$subsys->{NAME}";
+	$subsys->{OUTPUT} = "\$($subsys->{TYPE}_$subsys->{NAME}_OBJS)";
 }
 
 sub generate_shared_library($)