--===============0996671622==
Content-Type: multipart/signed;
  boundary="nextPart1361339.bJkNedx7Ui";
  protocol="application/pgp-signature";
  micalg=pgp-sha1
Content-Transfer-Encoding: 7bit

--nextPart1361339.bJkNedx7Ui
Content-Type: multipart/mixed;
  boundary="Boundary-01=_ffncCAzdfwPr61a"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_ffncCAzdfwPr61a
Content-Type: text/plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Hi all,

on Tuesday 26 April 2005 09:33, Stephan Kulow wrote:

> Am Montag 25 April 2005 21:18 schrieb Thomas Baumgart:
> > Hi all,
> >
> > Within our project, we try to stay as close as possible to the admin
> > directory of kdelibs (am_edit & Co). =C2=A0During the last weeks, we
> > noticed some pecularities in our build system such that moc files are
> > not being re-compiled when necessary. =C2=A0When scanning the archives =
of
> > this list, I noticed that some more people have problems with
> > moc-files so I became convinced it's a good idea to contact you.
> >
> > I traced our problem down and developed the attached patch, but don't
> > want to commit it to our repository before I don't have some comment
> > from the people who know more about it and can tell me what else I
> > brake when I use this patch. Your input is very welcome.
>
> Your idea is right, but your patch is wrong. You can't use include here
> - as that's GNU make specific. You need to reverse engineer automake
> generated files and use something like
> @AMDEP_TRUE@@am__include@
> @am__quote@./$(DEPDIR)/$mocFile.moc.Po@am__quote@
>
> Ah - and while you're at it you need of course to take in account
> .moc.cpp files that are part of libraries _and_ programs at the same
> time and make them .Plo then.=20

Ok, that was exactly the kind of input I was looking for. Attached some=20
updated version of the patch which takes that into account.

> There are some more joys connected to=20
> am_edit, but I leave that to the interested reader to find out  ;)

=2D-=20

Regards

Thomas Baumgart

thb@net-bembel.de               Check the KMyMoney open source
http://www.net-bembel.de/       project at http://kmymoney2.sf.net/

public key available under thb@net-bembel.de  at  http://www.keyserver.net
GPG-FP: E55E D592 F45F 116B 8429   4F99 9C59 DB40 B75D D3BA
=2D------------------------------------------------------------
Real Programmers don't write in PL/I. PL/I is for programmers who
can't decide whether to write in COBOL or FORTRAN.
=2D------------------------------------------------------------

--Boundary-01=_ffncCAzdfwPr61a
Content-Type: text/x-diff;
  charset="utf-8";
  name="am_edit.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="am_edit.diff"

=2D-- am_edit.1.416	2005-04-24 19:50:38.000000000 +0200
+++ am_edit	2005-04-28 07:32:12.000000000 +0200
@@ -1122,10 +1122,11 @@
    =20
     if (@newObs) {
         my $ext =3D  ($program =3D~ /_la$/) ? ".moc.lo " : ".moc.o ";
+	my $depExt =3D ($program =3D~ /_la$/) ? ".Plo " : ".Po ";
         $realObjs{$program} .=3D "\034" . join ($ext, @newObs) . $ext;
         $dependmocs{$program} =3D join (".moc.$cxxsuffix " , @newObs) . ".=
moc.$cxxsuffix";
         foreach $file (@newObs) {
=2D            $dep_files .=3D " \$(DEPDIR)/$file.moc.P" if($dep_files !~/$=
file.moc.P/);
+            $dep_files .=3D " \$(DEPDIR)/$file.moc$depExt" if($dep_files !=
~/$file.moc$depExt/);
         }
     }
     if (@depend) {
@@ -2250,6 +2251,8 @@
         }
         else
         {
+	    my $depExt =3D ($program =3D~ /_la$/) ? ".Plo " : ".Po ";
+	    appendLines ("\@AMDEP_TRUE\@\@am__include\@ \@am__quote\@ ./\$(DEPDIR=
)/$mocFile.moc$depExt\@am__quote\@\n");
             appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(MOC) $dir/$hF=
ile -o $mocFile$mocExt\n");
             $cleanMoc .=3D " $mocFile$mocExt";
 	    appendLines ("mocs: $mocFile$mocExt\n");

--Boundary-01=_ffncCAzdfwPr61a--

--nextPart1361339.bJkNedx7Ui
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: http://www.net-bembel.de/

iD8DBQBCcnfgnFnbQLdd07oRAgw1AKDLVFP8ZYQH07jT9SWw0WIksAlExgCaA+fC
YTJEC+OoPci8xU6EHQGoKe0=
=LKaq
-----END PGP SIGNATURE-----

--nextPart1361339.bJkNedx7Ui--


--===============0996671622==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

--===============0996671622==--