Bug 73467

Created attachment 4345 [details]
Patch (adds CLEANFILES to Makefile.am)

Alternatively the files to be removed could be listed individually in
CLEANFILES:
- admin.tar.gz
- gnome.tar.gz
- gnu.tar.gz
- incadmin.tar.gz
- wxwindows.tar.gz

Thanks again!!!

Subject: kdevelop

CVS commit by aclu: 

This patch fixes:
Bug 71003 : Cannot translate project due to srcdir != builddir.
Bug 73467: Incomplete make clean for parts/appwizard/common

1. buildtools/autotools/addtranslationdlg.cpp
Problem here was that a make was called in <projectDir>/po, but when Build
configuration is debug there is no makefile in that directory.
So the make has to be called from <buildDir>/po.
The 'force-reedit' works fine because it changes internally to <projectDir>/po
for most of it's actual work.

2. parts/appwizard/common/kde-Makefile.am
This patch is slightly different from the patch proposed earlier.
'make-messages' has to work in the <projectDir> tree, taking the source from
<projectDir>/src and writing the .pot file to <projectDir>/po.

3. parts/appwizard/common/admin/am_edit
The '$(MAKE) -C po merge' form 'make messages' again needs to work in the
<projectDir>/po directory, merging the .pot file into the .po files.

4. parts/appwizard/common/Makefile.am
'make clean' does not remove the *.tar.gz files created in the parts/appwizard/common directory.

To make this patch work you need to:
cd parts/appwizard/common 
make clean

Thanks to Frans Pop <aragorn  IN tiscali.nl> for the patch.

CCMAIL: 71003-done@bugs.kde.org
CCMAIL: 73467-done@bugs.kde.org


  M +1 -0      buildtools/autotools/addtranslationdlg.cpp   1.8
  M +2 -0      parts/appwizard/common/Makefile.am   1.14
  M +1 -1      parts/appwizard/common/kde-Makefile.am   1.3
  M +2 -2      parts/appwizard/common/admin/am_edit   1.6


--- kdevelop/buildtools/autotools/addtranslationdlg.cpp  #1.7:1.8
@@ -100,4 +100,5 @@ void AddTranslationDialog::accept()
     f.close();
 
+    dir = m_part->buildDirectory() + "/po";
     m_part->startMakeCommand(dir, QString::fromLatin1("force-reedit"));
 

--- kdevelop/parts/appwizard/common/admin/am_edit  #1.5:1.6
@@ -1612,5 +1612,5 @@
 
   if (!$lang) {
-    appendLines("merge:\n\t\$(MAKE) -f \$(top_srcdir)/admin/Makefile.common package-merge POFILES=\"\${POFILES}\" PACKAGE=\${PACKAGE}\n\n");
+    appendLines("merge:\n\t\$(MAKE) -C \$(top_srcdir)/po -f \$(top_srcdir)/admin/Makefile.common package-merge POFILES=\"\${POFILES}\" PACKAGE=\${PACKAGE}\n\n");
   }
  

--- kdevelop/parts/appwizard/common/Makefile.am  #1.13:1.14
@@ -1,2 +1,4 @@
+CLEANFILES = *.tar.gz
+
 admin.tar.gz:
         $(TAR) -cf admin.tar -C $(srcdir) admin

--- kdevelop/parts/appwizard/common/kde-Makefile.am  #1.2:1.3
@@ -13,5 +13,5 @@
 
 package-messages:
-        $(MAKE) -f $(top_srcdir)/admin/Makefile.common package-messages
+        cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages
         $(MAKE) -C po merge