diff options
Diffstat (limited to 'krozat/admin/am_edit')
| -rw-r--r-- | krozat/admin/am_edit | 221 |
1 files changed, 141 insertions, 80 deletions
diff --git a/krozat/admin/am_edit b/krozat/admin/am_edit index 7cadf55..9e37025 100644 --- a/krozat/admin/am_edit +++ b/krozat/admin/am_edit @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w # Expands the specialised KDE tags in Makefile.in to (hopefully) valid # make syntax. @@ -31,22 +31,6 @@ # Alex Zepeda <jazepeda@pacbell.net> # David Faure <faure@kde.org> # Stephan Kulow <coolo@kde.org> -# -# I've puddled around with automoc and produced something different -# 1999-02-01 John Birch <jb.nz@writeme.com> -# * Rewritten automoc to cater for more than just moc file expansion -# Version 0.01 does the same as automoc at this stage. -# 1999-02-18 jb -# * We must always write a Makefile.in file out even if we fail -# because we need the "perl autokmake" in the AUTOMAKE so that a -# "make" will regenerate the Makefile.in correctly. -# Reworked moc file checking so that missing includes in cpp -# will work and includes in cpp when using use_automoc will also -# work. -# 1999-02-23 jb -# * Added POFILE processing and changed the USE_AUTOMOC tag to -# AUTO instead. -# ... See ChangeLog for more logs use Cwd; use File::Find; @@ -98,6 +82,7 @@ $use_final = 1; # create code for --enable-final $cleantarget = "clean"; $dryrun = 0; $pathoption = 0; +$foreign_libtool = 0; while (defined ($ARGV[0])) { @@ -149,6 +134,11 @@ while (defined ($ARGV[0])) $use_final = 0; $thisProg .= " --no-final"; } + elsif (/^--foreign-libtool$/) + { + $foreign_libtool = 1; + $thisProg .= " --foreign-libtool"; + } elsif (/^-n$/) { $dryrun = 1; @@ -224,9 +214,9 @@ sub processMakefile ($) local %idlfiles = (); # lists the idl files used for $program local %globalmocs = ();# list of all mocfiles (in %mocFiles format) local %important = (); # list of files to be generated asap + local %uiFiles = (); local $allidls = ""; - local $alluis = ""; local $idl_output = "";# lists all idl generated files for cleantarget local $ui_output = "";# lists all uic generated files for cleantarget @@ -261,8 +251,8 @@ sub processMakefile ($) $important{$program} = ""; tag_IDLFILES(); # Sorts out idl rules tag_CLOSURE(); - tag_METASOURCES (); # Sorts out the moc rules tag_UIFILES(); # Sorts out ui rules + tag_METASOURCES (); # Sorts out the moc rules if ($sources_changed{$program}) { my $lookup = "$program" . '_SOURCES\s*=\s*(.*)'; substituteLine($lookup, "$program\_SOURCES=" . $sources{$program}); @@ -295,7 +285,8 @@ sub processMakefile ($) appendLines ("$cleantarget-metasources:\n\t-rm -f $cleanMoc\n"); $target_adds{"$cleantarget-am"} .= "$cleantarget-metasources "; } - tag_DIST(); + + tag_DIST() unless ($kdeopts{"noautodist"}); if ($idl_output) { appendLines ("$cleantarget-idl:\n\t-rm -f $idl_output\n"); @@ -329,10 +320,13 @@ sub processMakefile ($) appendLines($tmp); make_meta_classes(); + tag_COMPILE_FIRST(); tag_FINAL() if (!$kdeopts{"nofinal"}); my $final_lines = "final:\n\t\$(MAKE) "; + my $final_install_lines = "final-install:\n\t\$(MAKE) "; my $nofinal_lines = "no-final:\n\t\$(MAKE) "; + my $nofinal_install_lines = "no-final-install:\n\t\$(MAKE) "; foreach $program (@programs) { @@ -350,14 +344,18 @@ sub processMakefile ($) $new .= "\n\@KDE_USE_FINAL_TRUE\@$program\_OBJECTS = \$($program\_final\_OBJECTS)"; $final_lines .= "$program\_OBJECTS=\"\$($program\_final_OBJECTS)\" "; + $final_install_lines .= "$program\_OBJECTS=\"\$($program\_final_OBJECTS)\" "; $nofinal_lines .= "$program\_OBJECTS=\"\$($program\_nofinal\_OBJECTS)\" "; + $nofinal_install_lines .= "$program\_OBJECTS=\"\$($program\_nofinal_OBJECTS)\" "; } else { $new = "$program\_OBJECTS = " . $realObjs{$program}; } substituteLine ($lookup, $new); } appendLines($final_lines . "all-am"); + appendLines($final_install_lines . "install-am"); appendLines($nofinal_lines . "all-am"); + appendLines($nofinal_install_lines . "install-am"); my $lookup = 'DEP_FILES\s*=([^\n]*)'; if ($MakefileData =~ /\n$lookup\n/o) { @@ -387,7 +385,7 @@ sub processMakefile ($) # this here from install-data to install-exec. if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) { $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES"; - my $lookup = "install-data-am:\s*(.*)"; + my $lookup = 'install-data-am:\s*(.*)'; if ($MakefileData =~ /\n$lookup\n/) { my $newdeps = $1; $newdeps =~ s/\s*install-kde_moduleLTLIBRARIES\s*/ /g; @@ -398,7 +396,7 @@ sub processMakefile ($) my $lines = ""; foreach $add (keys %target_adds) { - my $lookup = quotemeta($add) . ":\s*(.*)"; + my $lookup = quotemeta($add) . ':([^\n]*)'; if ($MakefileData =~ /\n$lookup\n/) { substituteLine($lookup, "$add: " . $target_adds{$add} . $1); } else { @@ -426,15 +424,17 @@ sub processMakefile ($) } } - $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=link) (\$\(CXXLD\).*\$\(KCXXFLAGS\))'; + if($foreign_libtool == 0) { + $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=link) (\$\(CXXLD\).*\$\(KCXXFLAGS\))'; - if ($MakefileData =~ m/$lookup/ ) { - $MakefileData =~ s/$lookup/$1 --tag=CXX $2/; - } + if ($MakefileData =~ m/$lookup/ ) { + $MakefileData =~ s/$lookup/$1 --tag=CXX $2/; + } - $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=compile) (\$\(CXX\).*\$\(KCXXFLAGS\))'; - if ($MakefileData =~ m/$lookup/ ) { - $MakefileData =~ s/$lookup/$1 --tag=CXX $2/; + $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=compile)\s+(\$\(CXX\)\s+)'; + if ($MakefileData =~ m/$lookup/ ) { + $MakefileData =~ s/$lookup/$1 --tag=CXX $2/; + } } $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g; @@ -477,7 +477,7 @@ sub initialise () # Remove the line continuations, but keep them marked # Note: we lose the trailing spaces but that's ok. - $MakefileData =~ s/\\\s*\n/\034/g; + $MakefileData =~ s/\\\s*\n\s*/\034/g; # If we've processed the file before... restoreMakefile () if ($MakefileData =~ /$progId/); @@ -491,6 +491,8 @@ sub initialise () %kdeopts = (); $kdeopts{"foreign"} = 0; $kdeopts{"qtonly"} = 0; + $kdeopts{"noautodist"} = 0; + $kdeopts{"foreign-libtool"} = $foreign_libtool; $kdeopts{"nofinal"} = !$use_final; # default if ($MakefileData =~ /\nKDE_OPTIONS\s*=\s*([^\n]*)\n/) { @@ -550,17 +552,21 @@ sub initialise () } next if ($ocv); - + $program =~ s/^am_// if ($program =~ /^am_/); + my $sourceprogram = $program; + $sourceprogram =~ s/\@am_/\@/ if($sourceprogram =~ /^.*\@am_.+/); + print STDOUT "found program $program\n" if ($verbose); push(@programs, $program); $realObjs{$program} = $objs; - if ($MakefileData =~ /\n$program\_SOURCES\s*=\s*(.*)\n/) { + if ($MakefileData =~ /\n$sourceprogram\_SOURCES\s*=\s*(.*)\n/) { $sources{$program} = $1; - } else { + } + else { $sources{$program} = ""; print STDERR "found program with no _SOURCES: $program\n"; } @@ -581,9 +587,7 @@ sub initialise () if ($MakefileData =~ /($lookup)\n/) { substituteLine ($lookup, "DEPDIR = .deps\n$1"); } - } else { - print STDERR "$printname defines DEPDIR. This means you're using automake > 1.4 - this is not supported!\n"; - } + } my @marks = ('MAINTAINERCLEANFILES', 'CLEANFILES', 'DISTCLEANFILES'); foreach $mark (@marks) { @@ -668,7 +672,7 @@ sub tag_FINAL() # See if this file contains c++ code. (ie Just check the files suffix against my $suffix_is_cxx = 0; if($suffix =~ /($cppExt)$/) { - $cxx_suffix = $1; + $cxxsuffix = $1; $suffix_is_cxx = 1; } @@ -680,8 +684,8 @@ sub tag_FINAL() if ((@sourcelist == 1 && !$mocfiles_in) || $suffix_is_cxx != 1 ) { # we support IDL on our own - if ($suffix =~ /^skel$/ || $suffix =~ /^stub/ || $suffix =~ /^h$/ - || $suffix =~ /^ui$/ ) { + if ($suffix =~ /^skel$/ || $suffix =~ /^stub/ || $suffix =~ /^signals/ + || $suffix =~ /^h$/ || $suffix =~ /^ui$/ ) { next; } @@ -713,6 +717,7 @@ sub tag_FINAL() if ($mocfiles_in) { $handling .= $depedmocs{$program}; foreach $mocfile (split(' ', $depedmocs{$program})) { + if ($mocfile =~ m/\.$suffix$/) { $mocsources .= " " . $mocfile; } @@ -756,6 +761,42 @@ sub tag_FINAL() } } +#----------------------------------------------------------------------------- + +sub tag_COMPILE_FIRST() +{ + foreach $program (@programs) { + my $lookup = "$program" . '_COMPILE_FIRST\s*=\s*(.*)'; + if ($MakefileData =~ m/\n$lookup\n/) { + my @compilefirst = split(/[\s\034]+/, $1); + my @progsources = split(/[\s\034]+/, $sources{$program}); + my %donesources = (); + $handling = ""; + foreach $source (@progsources) { + my @deps = (); + my $sdeps = ""; + if (-f $source) { + $sdeps = "\$(srcdir)/$source"; + } else { + $sdeps = "$source"; + } + foreach $depend (@compilefirst) { + next if ($source eq $depend); + # avoid cyclic dependencies + next if defined($donesources{$depend}); + push @deps, $depend; + } + $handling .= "$sdeps: " . join(' ', @deps) . "\n" if (@deps); + $donesources{$source} = 1; + } + appendLines($handling) if (length($handling)); + } + } +} + +#----------------------------------------------------------------------------- + + # Organises the list of headers that we'll use to produce moc files # from. sub tag_METASOURCES () @@ -821,7 +862,7 @@ sub tag_METASOURCES () $realObjs{$program} .= "\034" . join ($ext, @newObs) . $ext; $depedmocs{$program} = join (".moc.$cxxsuffix " , @newObs) . ".moc.$cxxsuffix"; foreach $file (@newObs) { - $dep_files .= " \$(DEPDIR)/$file.moc.P"; + $dep_files .= " \$(DEPDIR)/$file.moc.P" if($dep_files !~/$file.moc.P/); } } if (@deped) { @@ -839,7 +880,7 @@ sub tag_METASOURCES () # Errors are logged in the global $errorflags sub tag_AUTOMAKE () { - my $lookup = '.*cd \$\(top_srcdir\)\s+&&\s+\$\(AUTOMAKE\)(.*)'; + my $lookup = '.*cd \$\(top_srcdir\)\s+&&[\s\034]+\$\(AUTOMAKE\)(.*)'; return 1 if ($MakefileData !~ /\n($lookup)\n/); print STDOUT "AUTOMAKE processing <$1>\n" if ($verbose); @@ -894,7 +935,7 @@ sub tag_SUBDIRS () return 1; } - my $subdirs; + my $subdirs = "."; opendir (THISDIR, "."); foreach $entry (readdir(THISDIR)) { @@ -920,8 +961,10 @@ sub tag_IDLFILES () foreach $source (@psources) { my $skel = ($source =~ m/\.skel$/); + my $stub = ($source =~ m/\.stub$/); + my $signals = ($source =~ m/\.signals$/); - if ($source =~ m/\.stub$/ || $skel) { + if ($stub || $skel || $signals) { my $qs = quotemeta($source); $sources{$program} =~ s/$qs//; @@ -929,14 +972,16 @@ sub tag_IDLFILES () print STDOUT "adding IDL file $source\n" if ($verbose); - $source =~ s/\.(stub|skel)$//; + $source =~ s/\.(stub|skel|signals)$//; my $sourcename; if ($skel) { $sourcename = "$source\_skel"; - } else { + } elsif ($stub) { $sourcename = "$source\_stub"; + } else { + $sourcename = "$source\_signals"; } my $sourcedir = ''; @@ -959,13 +1004,21 @@ sub tag_IDLFILES () if ($allidls !~ /$sourcename/) { + $dep_lines_tmp = ""; + if ($skel) { $dep_lines .= "$sourcename.$cxxsuffix: $source.kidl\n"; - $dep_lines .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub $source.kidl\n"; - } else { + $dep_lines .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-stub $source.kidl\n"; + } elsif ($stub) { + $dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n"; + } else { # signals + $dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n"; + } + + if ($stub || $signals) { $target_adds{"$sourcename.$cxxsuffix"} .= "$sourcename.h "; $dep_lines .= "$sourcename.h: $source.kidl\n"; - $dep_lines .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-skel $source.kidl\n"; + $dep_lines .= $dep_lines_tmp; } $allidls .= $sourcename . " "; @@ -985,7 +1038,7 @@ sub tag_IDLFILES () push(@cleanfiles, "$sourcename.$cxxsuffix"); push(@cleanfiles, "$sourcename.h"); push(@cleanfiles, "$sourcename.kidl"); - $dep_files .= " \$(DEPDIR)/$sourcename.P"; + $dep_files .= " \$(DEPDIR)/$sourcename.P" if ($dep_files !~/$sourcename.P/); } } if ($dep_lines) { @@ -1035,13 +1088,15 @@ sub tag_UIFILES () $sourcedir = '$(srcdir)/'; } - if ($alluis !~ /$source/) { + if (!$uiFiles{$source}) { $dep_lines .= "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n"; $dep_lines .= "\trm -f $source.$cxxsuffix\n"; if (!$kdeopts{"qtonly"}) { $dep_lines .= "\techo '#include <klocale.h>' > $source.$cxxsuffix\n"; - $dep_lines .= "\t\$(UIC) -tr i18n -i $source.h $sourcedir$source.ui | sed -e \"s,i18n( \\\"\\\" ),QString::null,g\" >> $source.$cxxsuffix || rm -f $source.$cxxsuffix\n"; + my ($mangled_source) = $source; + $mangled_source =~ s/[^A-Za-z0-9]/_/g; # get rid of garbage + $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui | sed -e \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" | sed -e \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | sed -e \"s,image\\([0-9][0-9]*\\)_data,img\\1_" . $mangled_source . ",g\" >> $source.$cxxsuffix || rm -f $source.$cxxsuffix\n"; } else { $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix || rm -f $source.$cxxsuffix\n"; } @@ -1051,7 +1106,7 @@ sub tag_UIFILES () $dep_lines .= "$source.moc: $source.h\n"; $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n"; - $alluis .= "$source "; + $uiFiles{$source} = 1; $depedmocs{$program} .= " $source.moc"; $globalmocs{$source} = "\035$source.h\035$source.cpp"; } @@ -1068,8 +1123,7 @@ sub tag_UIFILES () push(@cleanfiles, "$source.$cxxsuffix"); push(@cleanfiles, "source.h"); push(@cleanfiles, "$source.moc"); - - $dep_files .= " \$(DEPDIR)/$source.P"; + $dep_files .= " \$(DEPDIR)/$source.P" if($dep_files !~/$source.P/ ); } } if ($dep_lines) { @@ -1110,11 +1164,11 @@ sub tag_ICON() if ( $iconauto ) { push(@files, $entry) - if ($entry =~ /\.xpm/ || $entry =~ /\.png/); + if ($entry =~ /\.xpm/ || $entry =~ /\.png/ || $entry =~ /\.mng/); } else { foreach $appname (@appnames) { push(@files, $entry) - if ($entry =~ /-$appname\.xpm/ || $entry =~ /-$appname\.png/); + if ($entry =~ /-$appname\.xpm/ || $entry =~ /-$appname\.png/ || $entry =~ /-$appname\.mng/); } } } @@ -1125,7 +1179,7 @@ sub tag_ICON() foreach $file (@files) { my $newfile = $file; my $prefix = $file; - $prefix =~ s/\.(png|xpm)$//; + $prefix =~ s/\.(png|xpm|mng)$//; my $appname = $prefix; $appname =~ s/^[^-]+-// if ($appname =~ /-/) ; $appname =~ s/^[^-]+-// if ($appname =~ /-/) ; @@ -1173,7 +1227,7 @@ sub tag_ICON() 'hisc' => 'hicolor/scalable' ); - $newfile =~ s@.*-($appname\.(png|xpm?))@$1@; + $newfile =~ s@.*-($appname\.(png|xpm|mng?))@$1@; if (! defined $dir_hash{$prefix}) { print STDERR "unknown icon prefix $prefix in $printname\n"; @@ -1334,7 +1388,6 @@ sub tag_POFILES () if ($tmp =~ /^\s*AUTO\s*$/) { opendir (THISDIR, "."); - next if ($entry eq "CVS" || $entry =~ /^\./ || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^#.*#$/); $pofiles = join(" ", grep(/\.po$/, readdir(THISDIR))); closedir (THISDIR); print STDOUT "pofiles found = $pofiles\n" if ($verbose); @@ -1396,7 +1449,7 @@ sub replaceDestDir($) { || $line =~ /^\s*(\@.*\@)*\s*\$\(INSTALL\S*\)/ || $line =~ /^\s*(\@.*\@)*\s*(-?rm.*) \S*$/) { - $line =~ s/^(.*) ([^\s]*)\s*$/$1 \$(DESTDIR)$2/ if ($line !~ /\$\(DESTDIR\)/); + $line =~ s/^(.*) ([^\s]+)\s*$/$1 \$(DESTDIR)$2/ if ($line !~ /\$\(DESTDIR\)/); } if ($line ne $_[0]) { @@ -1422,7 +1475,7 @@ sub tag_CLOSURE () { my $lines = "$closure: \$($program\_OBJECTS) \$($program\_DEPENDENCIES)\n"; $lines .= "\t\@echo \"int main() {return 0;}\" > $program\_closure.$cxxsuffix\n"; $lines .= "\t\@\$\(LTCXXCOMPILE\) -c $program\_closure.$cxxsuffix\n"; - $lines .= "\t\@\$\(CXXLINK\) $program\_closure.lo \$($program\_LDFLAGS) \$($program\_OBJECTS) \$($program\_LIBADD) \$(LIBS)\n"; + $lines .= "\t\$\(CXXLINK\) $program\_closure.lo \$($program\_LDFLAGS) \$($program\_OBJECTS) \$($program\_LIBADD) \$(LIBS)\n"; $lines .= "\t\@rm -f $program\_closure.* $closure\n"; $lines .= "\t\@echo \"timestamp\" > $closure\n"; $lines .= "\n"; @@ -1443,11 +1496,13 @@ sub tag_DIST () { next if ($entry eq "CVS" || $entry =~ /^\./ || $entry =~ /^Makefile$$/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/); next if (! -f $entry); next if ($entry =~ /\.moc/ || $entry =~ /\.lo$/ || $entry =~ /\.la$/ || $entry =~ /\.o/); + next if ($entry =~ /.+meta_unload.$cppExt$/ || $entry =~ /\.all_$cppExt\.$cppExt$/); $foundfiles{$entry} = 1; } closedir (THISDIR); - my @marks = ("EXTRA_DIST", "DIST_COMMON", '\S*_SOURCES', '\S*_HEADERS', 'MAINTAINERCLEANFILES', 'CLEANFILES', 'DISTCLEANFILES', '\S*_OBJECTS'); + # doing this for MAINTAINERCLEANFILES would be wrong + my @marks = ("EXTRA_DIST", "DIST_COMMON", '\S*_SOURCES', '\S*_HEADERS', 'CLEANFILES', 'DISTCLEANFILES', '\S*_OBJECTS'); foreach $mark (@marks) { while ($MakefileData =~ /\n($mark)\s*=\s*([^\n]*)/g) { foreach $file (split('[\034\s]', $2)) { @@ -1547,7 +1602,7 @@ sub tag_DOCFILES () $lookup = '\nindex.cache.bz2:'; if ($MakefileData !~ /\n($lookup)/) { $lines .= "index.cache.bz2: \$(srcdir)/index.docbook \$(KDE_XSL_STYLESHEET) $files\n"; - $lines .= "\t\@if test -n \"\$(MEINPROC)\"; then echo \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; fi\n"; + $lines .= "\t-\@if test -n \"\$(MEINPROC)\"; then echo \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; fi\n"; $lines .= "\n"; } @@ -1626,14 +1681,17 @@ sub tag_DOCFILES () # are candidates for "moc-ing". sub findMocCandidates () { - my @list = (); foreach $dir (@headerdirs) { + my @list = (); opendir (SRCDIR, "$dir"); - @hFiles = grep { /.+\.$hExt$/o } readdir(SRCDIR); + @hFiles = grep { /.+\.$hExt$/o && !/^\./ } readdir(SRCDIR); closedir SRCDIR; foreach $hf (@hFiles) { + next if ($hf =~ /^\.\#/); + $hf =~ /(.*)\.[^\.]*$/; # Find name minus extension + next if ($uiFiles{$1}); open (HFIN, "$dir/$hf") || die "Could not open $dir/$hf: $!\n"; my $hfsize = 0; seek(HFIN, 0, 2); @@ -1652,8 +1710,8 @@ sub findMocCandidates () $hFile =~ /(.*)\.[^\.]*$/; # Find name minus extension if ($mocFiles{$1}) { - print STDERR "Warning: Multiple header files found for $1\n"; - next; # Use the first one + print STDERR "Warning: Multiple header files found for $1\n"; + next; # Use the first one } $mocFiles{$1} = "$dir\035$hFile"; # Add relative dir } @@ -1671,7 +1729,7 @@ sub findMocCandidates () sub pruneMocCandidates ($) { my %prunedMoc = (); - local @mocList = split(' ', @_[0]); + local @mocList = split(' ', $_[0]); foreach $mocname (@mocList) { @@ -1707,7 +1765,8 @@ sub checkMocCandidates () return unless (keys %mocFiles); opendir(THISDIR, ".") || return; @cppFiles = grep { /.+\.$cppExt$/o && !/.+\.moc\.$cppExt$/o - && !/.+\.all_$cppExt\.$cppExt$/o } readdir(THISDIR); + && !/.+\.all_$cppExt\.$cppExt$/o + && !/^\./ } readdir(THISDIR); closedir THISDIR; return unless (@cppFiles); my $files = join (" ", @cppFiles); @@ -1834,18 +1893,20 @@ sub make_meta_classes () $appl = "$srcfile: $mocs\n"; $appl .= "\t\@echo 'creating $srcfile'\n"; $appl .= "\t\@-rm -f $srcfile\n"; - $appl .= "\t\@echo 'static const char * _metalist_$program\[\] = {' > $srcfile\n"; - $appl .= "\t\@cat $mocs | grep 'char.*className' | "; - $appl .= "sed -e 's/.*[^A-Za-z0-9_:]\\([A-Za-z0-9_:]*\\)::className.*\$\$/\\\"\\1\\\",/' | sort | uniq >> $srcfile\n"; - $appl .= "\t\@echo '0};' >> $srcfile\n"; - $appl .= "\t\@echo '#include <kunload.h>' >> $srcfile\n"; - $appl .= "\t\@echo '_UNLOAD($program)' >> $srcfile\n"; - $appl .= "\n"; + $appl .= "\t\@if test \${kde_qtver} = 2; then \\\n"; + $appl .= "\t\techo 'static const char * _metalist_$program\[\] = {' > $srcfile ;\\\n"; + $appl .= "\t\tcat $mocs | grep 'char.*className' | "; + $appl .= "sed -e 's/.*[^A-Za-z0-9_:]\\([A-Za-z0-9_:]*\\)::className.*\$\$/\\\"\\1\\\",/' | sort | uniq >> $srcfile ;\\\n"; + $appl .= "\t\techo '0};' >> $srcfile ;\\\n"; + $appl .= "\t\techo '#include <kunload.h>' >> $srcfile ;\\\n"; + $appl .= "\t\techo '_UNLOAD($program)' >> $srcfile ;\\\n"; + $appl .= "\telse echo > $srcfile; fi\n"; + $appl .= "\n"; $realObjs{$program} .= " \034" . $objfile . " "; $sources{$program} .= " $srcfile"; $sources_changed{$program} = 1; - $dep_files .= " \$(DEPDIR)/$sourcename.P"; + $dep_files .= " \$(DEPDIR)/$sourcename.P" if($dep_files !~/$sourcename.P/); appendLines ($appl); } print STDOUT "\n" if $verbose; @@ -1866,7 +1927,7 @@ sub updateMakefile () || die "Could not create $makefile: $!\n"; print FILEOUT "\# $progId - " . '$Revision$ ' . "\n"; - $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines + $MakefileData =~ s/\034/\\\n\t/g; # Restore continuation lines print FILEOUT $MakefileData; close FILEOUT; } @@ -1895,7 +1956,7 @@ sub substituteLine ($$) if ($MakefileData =~ /\n($lookup)/) { $old = $1; $old =~ s/\034/\\\n#>\- /g; # Fix continuation lines - $new =~ s/\034/\\\n/g; + $new =~ s/\034/\\\n\t/g; my $newCount = ($new =~ tr/\n//) + 1; $MakefileData =~ s/\n$lookup/\n#>- $old\n#>\+ $newCount\n$new/; } else { @@ -1909,7 +1970,7 @@ sub substituteLine ($$) sub appendLines ($) { my ($new) = @_; - $new =~ s/\034/\\\n/g; # Fix continuation lines + $new =~ s/\034/\\\n\t/g; # Fix continuation lines my $newCount = ($new =~ tr/\n//) + 1; $MakefileData .= "\n#>\+ $newCount\n$new"; } |