diff options
Diffstat (limited to 'infrastructure/makebuildenv.pl.in')
| -rwxr-xr-x | infrastructure/makebuildenv.pl.in | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in index ed963c93..005f2d25 100755 --- a/infrastructure/makebuildenv.pl.in +++ b/infrastructure/makebuildenv.pl.in @@ -261,11 +261,7 @@ for(@modules_files) push @modules,$mod; my @md; # module dependencies my @lo; # link line options -<<<<<<< HEAD - for(@deps) -======= for (@deps) ->>>>>>> 0.12 { if(/\A-l/) { @@ -281,11 +277,7 @@ for(@modules_files) # make directories, but not if we're using an external library and this a library module my ($s,$d) = split /\//,$mod; -<<<<<<< HEAD - if($s ne 'lib' || $external_lib eq '') -======= if ($s ne 'lib' or $external_lib eq '') ->>>>>>> 0.12 { mkdir "release/$s",0755; mkdir "release/$s/$d",0755; @@ -354,12 +346,8 @@ for my $mod (@modules, @implicit_deps) for(grep /\.h\Z/i, @items) { next if /\A\._/; # Temp Mac OS Resource hack -<<<<<<< HEAD - die "Header file $_ already used in module ".$hfiles{$_}."\n" if exists $hfiles{$_}; -======= die "Header file $_ already used in module ".$hfiles{$_}. ", cannot add to $mod\n" if exists $hfiles{$_}; ->>>>>>> 0.12 $hfiles{$_} = $mod } } @@ -388,18 +376,11 @@ for my $mod (@modules, @implicit_deps) closedir DIR; } -<<<<<<< HEAD -======= # Then write a makefile for each module ->>>>>>> 0.12 print "done\n\nGenerating Makefiles...\n"; my %module_resources_win32; -<<<<<<< HEAD -# Then write a makefile for each module -======= ->>>>>>> 0.12 for my $mod (@implicit_deps, @modules) { print $mod,"\n"; @@ -503,10 +484,7 @@ __E } my @all_deps_for_module; -<<<<<<< HEAD -======= ->>>>>>> 0.12 { # work out what dependencies need to be run my @deps_raw; @@ -590,27 +568,16 @@ WINDRES = @WINDRES@ DEFAULT_CXXFLAGS = @CPPFLAGS@ $default_cxxflags @CXXFLAGS_STRICT@ \\ $include_paths $extra_platform_defines \\ -DBOX_VERSION="\\"$product_version\\"" -<<<<<<< HEAD -LDFLAGS = @LDFLAGS@ @LDADD_RDYNAMIC@ - -.ifdef RELEASE -CXXFLAGS = -DBOX_RELEASE_BUILD $release_flags \$(DEFAULT_CXXFLAGS) -======= LDFLAGS += @LDFLAGS@ @LDADD_RDYNAMIC@ .ifdef RELEASE CXXFLAGS += -DBOX_RELEASE_BUILD $release_flags \$(DEFAULT_CXXFLAGS) ->>>>>>> 0.12 OUTBASE = ../../release OUTDIR = ../../release/$mod DEPENDMAKEFLAGS = -D RELEASE VARIENT = RELEASE .else -<<<<<<< HEAD -CXXFLAGS = -g \$(DEFAULT_CXXFLAGS) -======= CXXFLAGS += -g \$(DEFAULT_CXXFLAGS) ->>>>>>> 0.12 OUTBASE = ../../debug OUTDIR = ../../debug/$mod DEPENDMAKEFLAGS = @@ -655,15 +622,12 @@ _PERL = \$(if \$(V),\$(PERL), @ echo " [PERL] \$@" && \$(PERL) >/dev/n __E } -<<<<<<< HEAD -======= # if there is a Makefile.pre, include it now if(-e "$mod/Makefile.pre") { print MAKE ".include <Makefile.pre>\n\n"; } ->>>>>>> 0.12 # read directory opendir DIR,$mod; @@ -784,11 +748,7 @@ __E $has_deps = 1; $has_deps = 0 if $target_is_library; -<<<<<<< HEAD - # Depenency stuff -======= # Dependency stuff ->>>>>>> 0.12 my $deps_makeinfo; if($has_deps) { @@ -814,9 +774,6 @@ __E # run make for things we require for my $dep (@all_deps_for_module) { -<<<<<<< HEAD - $deps_makeinfo .= "\t\t\$(HIDE) (cd ../../$dep; \$(MAKE)$sub_make_options -q \$(DEPENDMAKEFLAGS) -D NODEPS || \$(MAKE)$sub_make_options \$(DEPENDMAKEFLAGS) -D NODEPS)\n"; -======= my $dep_target = ""; if ($dep =~ m|^lib/(.*)|) { @@ -838,17 +795,12 @@ __E || \$(MAKE) $sub_make_options \$(DEPENDMAKEFLAGS) -D NODEPS $dep_target \\ ) EOF ->>>>>>> 0.12 } $deps_makeinfo .= ".\tendif\n.endif\n\n"; } print MAKE $deps_makeinfo if $bsd_make; -<<<<<<< HEAD - # get the list of library things to add -- in order of dependency so things link properly - my $lib_files = join(' ',map {($_ =~ m/lib\/(.+)\Z/)?('$(OUTBASE)/'.$_.'/'.$1.'.a'):undef} (reverse(@all_deps_for_module))); -======= # get the list of library things to add -- in order of dependency # so things link properly my @lib_files; @@ -863,7 +815,6 @@ EOF push @lib_files, "../../$dep/lib$1.a"; } } ->>>>>>> 0.12 # need to see if the extra makefile fragments require extra object files # or include any more makefiles @@ -882,11 +833,7 @@ EOF } print MAKE $end_target,': ',$o_file_list; -<<<<<<< HEAD - print MAKE " ",$lib_files unless $target_is_library; -======= print MAKE " @lib_files" unless $target_is_library; ->>>>>>> 0.12 print MAKE "\n"; if ($target_windows) @@ -913,15 +860,6 @@ EOF # work out library options # need to be... least used first, in absolute order they appear in the modules.txt file my @libops; -<<<<<<< HEAD - sub libops_fill - { - my ($m,$r) = @_; - push @$r,$_ for(@{$module_library_link_opts{$m}}); - libops_fill($_,$r) for(@{$module_dependency{$m}}); - } - libops_fill($mod,\@libops); -======= sub libops_fill { @@ -942,7 +880,6 @@ EOF libops_fill($mod,\@libops); ->>>>>>> 0.12 my $lo = ''; my %ldone; for(@libops) @@ -955,24 +892,16 @@ EOF # link line... print MAKE "\t\$(_LINK) \$(LDFLAGS) $link_line_extra " . "-o $end_target $o_file_list " . -<<<<<<< HEAD - "$lib_files$lo $platform_lib_files\n"; - } -======= "@lib_files $lo $platform_lib_files\n"; } ->>>>>>> 0.12 # tests need to copy the test file over if($type eq 'test') { print MAKE "\tcp _t \$(OUTDIR)/t\n\tchmod u+x \$(OUTDIR)/t\n"; print MAKE "\tcp _t-gdb \$(OUTDIR)/t-gdb\n\tchmod u+x \$(OUTDIR)/t-gdb\n"; } -<<<<<<< HEAD -======= ->>>>>>> 0.12 # dependency line? print MAKE "\n"; |