Re: [Freeciv-Dev] (PR#40326) S2_0: build out of srcdir is broken

2008-06-26 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40326 

2008/6/25 Jason Dorje Short:

 Hm, shouldn't the generated files be put into the build dir? or does
 generate_packets already do this?

 Yes, they should, but see #8164 for header problems that would cause.


 - ML



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#40326) S2_0: build out of srcdir is broken

2008-06-26 Thread Jason Dorje Short

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40326 

Marko Lindqvist wrote:
 URL: http://bugs.freeciv.org/Ticket/Display.html?id=40326 
 
 2008/6/25 Jason Dorje Short:
 Hm, shouldn't the generated files be put into the build dir? or does
 generate_packets already do this?
 
  Yes, they should, but see #8164 for header problems that would cause.

True!  I remember that discussion.

But skimming to the end it looks like the conclusion is the whole thing 
could be done just fine, if only we were willing to use  instead of  
for our header includes?

-jason



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#40326) S2_0: build out of srcdir is broken

2008-06-26 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40326 

2008/6/26 Jason Dorje Short:

 Marko Lindqvist wrote:

 2008/6/25 Jason Dorje Short:
 Hm, shouldn't the generated files be put into the build dir? or does
 generate_packets already do this?

  Yes, they should, but see #8164 for header problems that would cause.

 True!  I remember that discussion.

 But skimming to the end it looks like the conclusion is the whole thing
 could be done just fine, if only we were willing to use  instead of 
 for our header includes?

 I think the final solution (so far) in that ticket; separate
directory for generated headers, would be cleaner and more robust
solution. I'll test that for S2_2 / trunk.
 Current ticket is about backporting S2_1 solution to S2_0. IMO if we
start backporting fixes to this, S2_2 solution should be backported to
both S2_1 and S2_0. Workdir for generate_packets.py execution is
builddir, but it generates files to source tree.


 - ML



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#40326) S2_0: build out of srcdir is broken

2008-06-25 Thread Egor Vyscrebentsov

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40326 

Good daytime!

In common/Makefile.am there is a call to ./generate_packets.py
In S2_1 and later this is already fixed.

Backport from S2_1 attached.

-- 
Thanks, evyscr

--- common/Makefile.am.orig	2006-02-16 15:47:00 +0300
+++ common/Makefile.am	2008-06-25 12:24:25 +0400
@@ -68,7 +68,7 @@
 packets_gen.h packets_gen.c: packets_generate
 .INTERMEDIATE: packets_generate
 packets_generate: packets.def generate_packets.py
-	./generate_packets.py
+	cd $(srcdir)  ./generate_packets.py
 	touch packets_generate
 
 #libcivcommon_a_DEPENDENCIES = ../utility/libcivutility.a
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#40326) S2_0: build out of srcdir is broken

2008-06-25 Thread Jason Dorje Short

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40326 

Egor Vyscrebentsov wrote:
 URL: http://bugs.freeciv.org/Ticket/Display.html?id=40326 
 
 Good daytime!
 
 In common/Makefile.am there is a call to ./generate_packets.py
 In S2_1 and later this is already fixed.
 
 Backport from S2_1 attached.

Hm, shouldn't the generated files be put into the build dir? or does 
generate_packets already do this?

In that case it'd be more like:

cd $(builddir)  $(srcdir)/generate_packets.py

-jason



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev