Commit f89cefe8 authored by Joachim Eibl's avatar Joachim Eibl
Browse files

0.9.86


git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@69 c8aa9fed-2811-0410-8543-893ada326672
parent 2a0abc6f
......@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......@@ -278,3 +278,63 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
Version 0.9.86 - 2004/06/14
===========================
- Double click on any file in directory merge would close the directory merge window. (Regression in 0.9.85)
Version 0.9.85 - 2004/06/14
===========================
- When solving a conflict KDiff3 reports the number of remaining unsolved conflicts in the status bar.
Bugfixes:
- Fix for MergeResultWindow-contextmenu: All items were disabled always. (new in 0.9.84)
- Fix for problem when opening files specified relative to current directory. (new in 0.9.84, qt-only-version)
- Fix for compilation with older gcc (2.9x)
- Several Word-wrap problems fixed:
- Find string with word wrap active didn't work if found text was not in first wrap-line.
- overview-position was not updated when toggling word wrap
- horizontal scrollbar was not updated when toggling word wrap
- current selection was lost when toggling word wrap
- selecting a conflict in the diff-text-window didn't work right with word wrap.
- Qt-only: Bold attribute for fonts was not persistent
- Qt-only: Toolbar position was not persistent
- Qt-only: Language-choice shows also the full language name.
- Cursor and windows-boundary-lines were always black instead of having the foreground color
- Starting KDiff3 with two not existing files showed a dialog saying that files are binary equal.
- Errors while starting a directory comparison now also reopens the open-dialog.
- Speedup during directory comparison by avoiding unnecessary redraws. (These always creep in again :-()
- On KDE: When resetting to default options (or first start) now the default KDE-fixed font will be used.
- Mergeresultwindow: Improved behaviour after automatic merge operation.
Version 0.9.84 - 2004/05/29
============================
New Features:
- Word Wrap for DiffTextWindow
- Directory-Comparison: Option "Full Analysis" allows to show the number of solved vs. unsolved
conflicts or deltas vs. whitespace-changes in the directory tree.
- Diff-Menu for Diff-view specific entries
- Docs now contain a new chapter for uses of preprocessor and line-matching-preprocessor.
- Added several credits which now are also visible in the Qt-only version.
- The Qt-only version now also shows all command-line options. Under windows a dialog shows them.
- Command line options -u and -L for Subversion-support.
- Command line options --L1/2/3 for specifying alias names.
- In the Qt-only-version the user-interface-language can be set via the regional-settings
(only effective after a restart).
- ProgressDialog redesign for recursive use.
- Overview now allows to show the delta between two other files in triplediff-mode.
- Option to ignore case which treats case-changes like white space (instead of conversion to upcase).
Bugfixes:
- Dir-Comp: When one file exists, but the other doesn't then instead the latest used other file was displayed.
- Open dialog: When previously a file C was used, but should be empty now, it reappeared unbidden.
- Several bugs for 64-bit systems fixed.
- Fixed crash when one file ended with a newline and the other did not.
- Windows: Case insensitive filename-pattern matching.
- Corrected behaviour for files with size 0.
- Fix for crash due to a race-condition (Patch by Eike Sauer)
- Windows: Scrolling didn't work right when another window was in front.
- Mergeresultwindow didn't show correct position when starting a second or later merge.
- Fix for problem where sometimes the A/B/C-buttons were in wrong state.
- Pasting from selection via the middle mousebutton.
Version 0.9.83 - 2004/03/06
===========================
- Reading directorys fixed for Win95/98
......
......@@ -2,8 +2,8 @@ KDiff3-Readme
=============
Author: Joachim Eibl (joachim.eibl@gmx.de)
Copyright: (C) 2002-2003 by Joachim Eibl
KDiff3-Version: 0.9.83
Copyright: (C) 2002-2004 by Joachim Eibl
KDiff3-Version: 0.9.86
KDiff3 is a program that
......@@ -45,29 +45,29 @@ Exception from the GPL:
Requirements & Installation:
Version 0.9.83 provides special support for KDE3, but it can also be
Version 0.9.86 provides special support for KDE3, but it can also be
built without KDE3 if the Qt-libraries are available.
(I also tested the program under Windows.)
(I also test and use the program under Windows.)
You always need
- kdiff3-0.9.83.tar.gz
- kdiff3-0.9.86.tar.gz
For building the KDE3-version
- KDE>=3.1 and QT>=3.1-libraries.
- KDE>=3.1 and QT>=3.1-libraries. (QT>=3.2 is recommended)
- gcc, g++ with version >=3.2
For building the Qt-only-version
- QT-libraries (version >=3.1.0).
(www.trolltech.com)
- for Un*x: gcc, g++ with version >=3.2
- for Windows: VC6
- for Windows: VC6 / VC7.1
Installation for KDE3:
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
- cd into the directory kdiff3-0.9.83 and type
- cd into the directory kdiff3-0.9.86 and type
- ./configure --prefix=/opt/kde3 (your KDE3 directory here)
- (make clean) (Required if you already compiled once.)
- make (Run compilation)
......@@ -82,7 +82,7 @@ Installation for KDE3:
This command should tell you: kde-config --prefix
For SuSE and most distributions the prefix usually is /opt/kde3.
For Redhat and Mandrake the prefix usually is /usr.
For Redhat/Fedora and Mandrake the prefix usually is /usr.
For a local installation, that doesn't need root rights try
- ./configure --prefix=$KDEHOME ($KDEHOME probably is the same as $HOME/.kde)
- make
......@@ -108,14 +108,14 @@ Installation for the Qt-only-platforms for Un*x:
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
If it doesn't contain the correct path, type
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt)
- cd into the directory kdiff3-0.9.83/src and type
- cd into the directory kdiff3-0.9.86/src and type
- make -f Makefile.qt
- make -f Makefile.qt install (You must have root-rights for this step.)
(copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3)
- Note: The file kdiff3.pro was used to generate the Makefile.qt:
qmake kdiff3.pro -o Makefile.qt
If you want to build the Qt-only version _and_ the KDE-version, do this
in separate directories, otherwise there will be errors.
Build for Windows:
Use qmake and kdiff3.pro to generate
......
This file contains some feature-wishes for future KDiff3-versions.
TODO
====
- Overview-option to show only remaining conflicts.
- Colors for disabled and enabled arrow are very similar
- ??? The gutters (kdiff3 have 2 "gutters") fonts and background-foreground colors sholud be configured other
than the "general" foreground-background colors. Otherwise they are confused with the main dialog.
- Unicode and UTF8 support
- Try to autodetect the line-end-style
- Ignore cvs-keywords like $Revision$
- Correct Christof crash with the Find-function.
- Windows: Check if folders can match case-insensitive.
- Close diff/merge window-menu-action.
- Automatic line wrap for too long lines in the difference windows
- Printing of the diff-windows (requires automatic line wrap)
- Undo function in the merge-editor.
- More viewing options for directory widget.
- And one observation. When select Cyrillic charset - it looks like it was
not saved. When open this dialog again - Latin charset is selected anyway.
- Add options to specify a language and charset.
- Add options to specify charset.
- Ask before saving to a file that already exists (optionally).
- Don't overwrite existing .orig-file, when saving the second time.
......@@ -20,16 +32,13 @@ TODO
- Optionally show size/date for A/B/C
- Choose what to see (all or only different items)
- If only different items are visible: copy the others nevertheless to destdir.
- Improve Ctrl-1/2/3 shortcuts in Dirview.
- Warnung wenn Datum in B oder C älter als A ist.
- Zielverzeichnis nachträglich änderbar
- Warnung wenn Datum in B oder C �ter als A ist.
- Zielverzeichnis nachtr�lich �derbar
- Bei Kopie von Remote nach lokal: Auf jeden Fall das modification Datum setzen.
- Ctrl-Space doesn't work when a file comparison takes place.
- Option to allow case-insensitive filename-matching.
- Options to show/suppress annoying messages
- Unicode-support
- What's this-Help.
- Tip of the day.
......@@ -49,32 +58,3 @@ More Statistics before the merge begins:
- Allow analysis of unified directory-diff/patch-file.
- Add example for line-matching preprocessor to the documentation.
Simple testcase: Consider file a.txt (6 lines):
aa
ba
ca
da
ea
fa
And file b.txt (3 lines):
cg
dg
eg
And the following line matching preprocessor command, that replaces 'g' with 'a':
/usr/bin/perl -p -e 's/g/a/;'
Without that command the following lines would be placed next to each other:
aa - cg
ba - dg
ca - eg
da
ea
fa
But with this command the result of the comparison would be:
aa
ba
ca - cg
da - dg
ea - eg
fa
......@@ -17,6 +17,9 @@ apidox-am-yes:
echo "IMAGE_PATH = $(top_srcdir)/doc/api" >> Doxyfile ;\
echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile; \
echo "HTML_OUTPUT = $(subdir)/html" >> Doxyfile; \
echo "HTML_HEADER = $(top_builddir)/apidocs/common/header.html" >> Doxyfile;\
echo "HTML_FOOTER = $(top_builddir)/apidocs/common/footer.html" >> Doxyfile;\
echo "HTML_STYLESHEET = $(top_builddir)/apidocs/common/doxygen.css" >> Doxyfile;\
echo "LATEX_OUTPUT = $(subdir)/latex" >> Doxyfile; \
echo "RTF_OUTPUT = $(subdir)/rtf" >> Doxyfile; \
echo "MAN_OUTPUT = $(subdir)/man" >> Doxyfile; \
......@@ -24,7 +27,17 @@ apidox-am-yes:
echo "GENERATE_MAN = $(GENERATE_FLAG)" >> Doxyfile ;\
echo "GENERATE_LATEX = $(GENERATE_FLAG)" >> Doxyfile ;\
if test -n "$(DOXYGEN_EXCLUDE)"; then \
echo "EXCLUDE_PATTERNS += $(DOXYGEN_EXCLUDE)" >> Doxyfile; \
patterns= ;\
dirs= ;\
for item in `echo "$(DOXYGEN_EXCLUDE)"`; do \
if test -d "$(srcdir)/$$item"; then \
dirs="$$dirs $(srcdir)/$$item/" ;\
else \
patterns="$$patterns $$item" ;\
fi ;\
done ;\
echo "EXCLUDE_PATTERNS += $$patterns" >> Doxyfile; \
echo "EXCLUDE += $$dirs" >> Doxyfile ;\
fi ;\
echo "TAGFILES = \\" >> Doxyfile; \
tags='$(DOXYGEN_REFERENCES) qt'; for tag in $$tags; do \
......@@ -45,7 +58,7 @@ apidox-am-yes:
fi ;\
fi ;\
done ;\
echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/$(subdir).tag" >> Doxyfile ;\
echo "GENERATE_TAGFILE = $(top_builddir)/apidocs/$(subdir)/`basename $(subdir)`.tag" >> Doxyfile ;\
echo "IGNORE_PREFIX = K" >> Doxyfile ;\
echo "HAVE_DOT = $(KDE_HAVE_DOT)" >> Doxyfile ;\
$(DOXYGEN) Doxyfile ;\
......@@ -65,9 +78,9 @@ install-apidox:
fi; \
if test -d $(top_builddir)/apidocs/$(subdir)/html; then \
list=`ls $(top_builddir)/apidocs/$(subdir)/html`; \
echo "installing $(top_builddir)/apidocs/$(subdir)/html" ;\
for file in $$list; do \
echo $(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
$(INSTALL_DATA) $(top_builddir)/apidocs/$(subdir)/html/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir)/html; \
done; \
fi; \
rm -f $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/common; \
......@@ -76,9 +89,9 @@ install-apidox:
if test -d $(top_builddir)/apidocs; then \
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs ;\
list=`cd $(top_builddir)/apidocs && ls -1`; \
echo "installing $(top_builddir)/apidocs/$$file" ;\
for file in $$list; do \
if test -f $(top_builddir)/apidocs/$$file; then \
echo $(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
$(INSTALL_DATA) $(top_builddir)/apidocs/$$file $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \
fi; \
done ; fi; \
......@@ -126,8 +139,8 @@ apidox-am-toplevel-no:
apidox-am-toplevel-yes:
@echo "*** Creating API documentation main page"; \
cp $(top_srcdir)/admin/Doxyfile.global Doxyfile; \
echo "PROJECT_NAME = $(DOXYGEN_PROJECT_NAME)" >> Doxyfile ; \
echo "PROJECT_NUMBER = $(DOXYGEN_PROJECT_NUMBER)" >> Doxyfile ; \
echo "PROJECT_NAME = \"$(DOXYGEN_PROJECT_NAME)\"" >> Doxyfile ; \
echo "PROJECT_NUMBER = \"$(DOXYGEN_PROJECT_NUMBER)\"" >> Doxyfile ; \
echo "INPUT = $(top_srcdir)" >> Doxyfile ; \
echo "OUTPUT_DIRECTORY = $(top_builddir)/apidocs" >> Doxyfile ; \
echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \
......@@ -158,6 +171,9 @@ apidox-am-toplevel-yes:
doxygen Doxyfile; \
rm -f Doxyfile
.PHONY: apidox-am-yes apidox-am-no install-data-local install-apidox install-apidox uninstall-local uninstall-apidox uninstall-apidox apidox apidox-am-toplevel-no apidox-am-toplevel-yes
# Local Variables:
# mode: makefile
# End:
This diff is collapsed.
......@@ -6,7 +6,7 @@
SHELL=/bin/sh
cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am:
cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4:
@admindir=$(admindir); \
if test "x$$admindir" = x; then \
admindir=.; until test -f $$admindir/admin/cvs.sh; do \
......@@ -23,10 +23,11 @@ cvs dist cvs-clean configure configure.in configure.files subdirs package-messag
if test "$@" = "package-merge"; then \
MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \
$(SHELL) $$admindir/cvs.sh package-merge ;\
else MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
else \
MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
fi
configure.in: configure.files $(shell test -f configure.files && cat configure.files) subdirs
configure.in: configure.files subdirs
configure.files: subdirs
.SILENT:
......
This diff is collapsed.
......@@ -51,6 +51,7 @@ sub findMocCandidates ();
sub pruneMocCandidates ($);
sub checkMocCandidates ();
sub addMocRules ();
sub findKcfgFile($);
sub tag_AUTOMAKE ();
sub tag_META_INCLUDES ();
......@@ -60,6 +61,7 @@ sub tag_DOCFILES ();
sub tag_LOCALINSTALL();
sub tag_IDLFILES();
sub tag_UIFILES();
sub tag_KCFGFILES();
sub tag_SUBDIRS();
sub tag_ICON();
sub tag_CLOSURE();
......@@ -111,11 +113,12 @@ while (defined ($ARGV[0]))
{
$verbose = 1; # Oh is there a problem...?
}
elsif (/^-p(.+)$|^--path=(.+)$/)
elsif (/^(?:-p|--path=)(.+)$/)
{
$thisProg = "$1/".basename($thisProg) if($1);
$thisProg = "$2/".basename($thisProg) if($2);
my $p = $1;
$thisProg = $p . "/". basename($thisProg);
warn ("$thisProg doesn't exist\n") if (!(-f $thisProg));
$thisProg .= " -p".$p;
$pathoption=1;
}
elsif (/^--help$|^-h$/)
......@@ -222,10 +225,12 @@ sub processMakefile ($)
local %globalmocs = ();# list of all mocfiles (in %mocFiles format)
local %important = (); # list of files to be generated asap
local %uiFiles = ();
local %kcfgFiles = ();
local $allidls = "";
local $idl_output = "";# lists all idl generated files for cleantarget
local $ui_output = "";# lists all uic generated files for cleantarget
local $kcfg_output = "";# lists all kcfg generated files for cleantarget
local %dependmocs = ();
......@@ -263,14 +268,15 @@ sub processMakefile ($)
tag_NO_UNDEFINED();
tag_CLOSURE();
tag_NMCHECK();
tag_UIFILES(); # Sorts out ui rules
tag_UIFILES(); # Sorts out ui rules
tag_KCFGFILES(); # Sorts out kcfg rules
tag_METASOURCES (); # Sorts out the moc rules
if ($sources_changed{$program}) {
my $lookup = $program . '_SOURCES\s*=[ \t]*(.*)';
if($program =~ /libkdeinit_(.*)/) {
my $prog = $1;
substituteLine($prog . '_SOURCES\s*=[ \t]*.*',
substituteLine($prog . '_SOURCES\s*=[ \t]*(.*)',
"${prog}_SOURCES = ${prog}_dummy.$cxxsuffix\n" .
"libkdeinit_${prog}_SOURCES = " . $sources{$program});
$sources{$prog} = "${prog}_dummy.$cxxsuffix";
......@@ -320,6 +326,11 @@ sub processMakefile ($)
$target_adds{"$cleantarget-am"} .= "$cleantarget-ui ";
}
if ($kcfg_output) {
appendLines ("$cleantarget-kcfg:\n\t-rm -f $kcfg_output\n");
$target_adds{"$cleantarget-am"} .= "$cleantarget-kcfg ";
}
if ($closure_output) {
appendLines ("$cleantarget-closures:\n\t-rm -f $closure_output\n");
$target_adds{"$cleantarget-am"} .= "$cleantarget-closures ";
......@@ -527,8 +538,10 @@ sub initialise ()
}
# Checking for files to process...
open (FILEIN, $makefile)
|| die "Could not open $makefileDir/$makefile: $!\n";
open (FILEIN, $makefile) || die "Can't open $makefileDir/$makefile: $!\n";
# perl bug in 5.8.0: in utf8 mode it badly screws up
binmode(FILEIN, ":bytes") if ($] >= 5.008);
# Read the file
# stat(FILEIN)[7] might look more elegant, but is slower as it
# requires stat'ing the file
......@@ -734,6 +747,7 @@ sub tag_FINAL()
my %shash = ();
@shash{@progsources} = 1; # we are only interested in the existence
my %sourcelist = ();
my %extradeps = ();
foreach $source (@progsources) {
my $suffix = $source;
......@@ -751,8 +765,13 @@ sub tag_FINAL()
$moc_cpp_added = 1;
}
}
# scan for extra given dependencies and add them to our target
while ($MakefileData =~ /\n\s*(\S+)\.(?:lo|o)\s*:([^\n]*)/g) {
$extradeps{$1} = $2;
}
foreach $suffix (keys %sourcelist) {
# See if this file contains c++ code. (i.e., just check the file's suffix against c++ extensions)
my $suffix_is_cxx = 0;
if($suffix =~ /($cppExt)$/) {
......@@ -769,7 +788,8 @@ sub tag_FINAL()
# we support IDL on our own
if ($suffix eq "skel" || $suffix =~ /^stub/
|| $suffix =~ /^signals/ # obsolete, remove in KDE-4
|| $suffix eq "h" || $suffix eq "ui" ) {
|| $suffix eq "h" || $suffix eq "ui"
|| $suffix eq "kcfgc" ) {
next;
}
......@@ -793,6 +813,9 @@ sub tag_FINAL()
} else {
$source_deps .= " $source";
}
my $plainsource = $source;
$plainsource =~ s/\.$cppExt$//;
$source_deps .= " " . $extradeps{$plainsource} if (exists($extradeps{$plainsource}));
}
$handling = "$program.all_$suffix.$suffix: \$(srcdir)/Makefile.in" . $source_deps . " " . join(' ', $mocs) . "\n";
......@@ -852,7 +875,8 @@ sub tag_KDEINIT()
$lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}.la.$cxxsuffix\n";
$lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n";
$lines .= "\t echo > ${kdeinit}_dummy.$cxxsuffix\n";
$lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
$lines .= "\techo 'extern \"C\" int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
push(@cleanfiles, "${kdeinit}.la.$cxxsuffix");
push(@cleanfiles, "${kdeinit}_dummy.$cxxsuffix");
......@@ -868,7 +892,7 @@ sub tag_KDEINIT()
substituteLine($lookup, "${kdeinit}_la_LIBADD = libkdeinit_${kdeinit}.la");
appendLines("libkdeinit_${kdeinit}_la_LIBADD = $libadd\n");
}
appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = \$(all_libraries)\n");
appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n");
# add library dependencies
$lookup = $kdeinit . '_la_DEPENDENCIES\s*=[ \t]*(.*)';
......@@ -944,7 +968,7 @@ sub tag_KDEINIT()
$realname{$kdeinit} = $kdeinit;
$sources{$kdeinit} = "${kdeinit}.la.$cxxsuffix";
$lines .= "${kdeinit}_LDFLAGS = \$(all_libraries)\n";
$lines .= "${kdeinit}_LDFLAGS = \$(KDE_RPATH) -no-undefined \$(all_libraries)\n";
$lines .= "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la\n";
$lines .= "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la\n";
......@@ -972,7 +996,7 @@ sub tag_KDEINIT()
if($#progs >= 0) {
if($MakefileData !~ m/\nbin_PROGRAMS\s*=/) {
print STDERR "Error: bin_PROGRAMS missing in $printname (required for bin_PROGRAMS).\n";
print STDERR "Error: bin_PROGRAMS missing in $printname (required for kdeinit_LTLIBRARIES).\n";
$errorflag = 1;
}
else {
......@@ -1026,7 +1050,7 @@ sub tag_COMPILE_FIRST()
next if defined($donesources{$depend});
push @deps, $depend;
}
$target_adds{$sdeps} = join(' ', @deps) if (@deps);
$target_adds{$sdeps} .= join(' ', @deps) . ' ' if (@deps);
$donesources{$source} = 1;
}
}
......@@ -1128,7 +1152,8 @@ sub tag_AUTOMAKE ()
$lookup = '.*cd \$\(srcdir\)\s+&&[\034\s]+\$\(AUTOCONF\)(.*)';
if ($MakefileData =~ /\n($lookup)\n/) {
$newLine = "\tcd \$(srcdir) && rm -f configure && \$(MAKE) -f admin/Makefile.common configure";
$newLine = "\tcd \$(srcdir) && rm -f configure\n";
$newLine .= "\tcd \$(top_srcdir) && \$(MAKE) -f admin/Makefile.common configure";
substituteLine ($lookup, $newLine);
}
......@@ -1236,8 +1261,11 @@ sub tag_IDLFILES ()
if ($allidls !~ /$source\_kidl/) {
$use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/);
$dcopidl = $use_ng ? "\$(DCOPIDLNG)" : "\$(DCOPIDL)";
$dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
$dep_lines .= "\t\$(DCOPIDL) $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
$dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
$allidls .= $source . "_kidl ";
}
......@@ -1332,11 +1360,12 @@ sub tag_UIFILES ()
my $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 .= "\techo '#include <kdialog.h>' > $source.$cxxsuffix\n";
$dep_lines .= "\techo '#include <klocale.h>' >> $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 > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
$dep_lines .= "\tsed -e \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | sed -e \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | sed -e \"s,image\\([0-9][0-9]*\\)_data,img\\1_" . $mangled_source . ",g\" >> $source.$cxxsuffix ;\\\n";
$dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" >> $source.$cxxsuffix ;\\\n";
$dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
} else {
$dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n";
......@@ -1364,13 +1393,69 @@ sub tag_UIFILES ()
$important{$program} .= "$source.h ";
$ui_output .= "\\\n\t$source.$cxxsuffix $source.h $source.moc ";
push(@cleanfiles, "$source.$cxxsuffix");
push(@cleanfiles, "source.h");
push(@cleanfiles, "$source.h");
push(@cleanfiles, "$source.moc");
$dep_files .= " \$(DEPDIR)/$source.P" if($dep_files !~/$source.P/ );
}
}
}
sub tag_KCFGFILES ()
{
my @psources = split(/[\034\s]+/, $sources{$program});
my @depFiles = ();
foreach $source (@psources) {
if ($source =~ m/\.kcfgc$/) {
print STDERR "adding KCFG file $source\n" if ($verbose);
my $qs = quotemeta($source);
$sources{$program} =~ s/$qs//;
$sources_changed{$program} = 1;
$source =~ s/\.kcfgc$//;
my $sourcedir = '';
if (-f "$makefileDir/$source.kcfgc") {
$sourcedir = '$(srcdir)/';
}
if (!$kcfgFiles{$source}) {
$kcfg = "$program.kcfg";
findKcfgFile("$source.kcfgc");
my $fixsuffix = "";
$fixsuffix = "else mv $source.cpp $source.<