ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/SCRAM/src/BuildSystem/BuildSetup.pm

Comparing COMP/SCRAM/src/BuildSystem/BuildSetup.pm (file contents):
Revision 1.22 by sashby, Fri Apr 12 16:42:08 2002 UTC vs.
Revision 1.23 by sashby, Mon May 13 12:43:53 2002 UTC

#	Line 112 | Line 112 | sub _generateexternals
112		print $fout 'LDFLAGS+=$(addprefix -L,$(LIBDIR))'."\n";
113		print $fout 'CPPFLAGS+=$(addprefix -D,$(CPPDEFINES))'."\n";
114		print $fout 'lib+=$(extralib)'."\n";
115	<	print $fout 'LDLIBS+=$(addprefix -l,$(lib))'."\n";
115	>	# Hack to parse the lib list and remove duplicates:
116	>	print $fout 'ORDEREDLIB=$(shell $(SCRAMPERL) $(TOOL_HOME)/ProcessLibs $(lib))',"\n";
117	>	print $fout 'LDLIBS+=$(addprefix -l,$(ORDEREDLIB))'."\n";
118	>	#print $fout 'LDLIBS+=$(addprefix -l,$(lib))'."\n";
119		print $fout 'LDLIBS+=$(addprefix -l,$(REQUIRES))'."\n";
120		print $fout 'LD_LIBRARY_PATH:=$(subst $(space),:,$(LD_LIBRARY_PATH))'."\n";
121	<
121	>
122		undef $fout;
123		}
124		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines