com gtk/php-gtk: - Don't include gen_libglade.h from ph p_libglade.h - Adjust make files to remove ex tra gen_ prefix: ext/libglade/Makefile.frag ext/l ibglade/php_libglade.h

[email protected] (David Soria Parra) Sun, 09 Oct 2005 17:53:10 +0000
Newsgroups php.gtk.cvs
Message-ID <[email protected]>
Commit:    61f16601ba13a13f5234474957527494eae9ef04=0AAuthor:    Andrei Zmi=
evski <[email protected]>         Sun, 9 Oct 2005 17:53:10 +0000=0AParents:   =
aa4eda9f5e8394657b6d982162ae6678667db633=0ABranches:  master=0A=0ALink:    =
   http://git.php.net/?p=3Dgtk/php-gtk.git;a=3Dcommitdiff;h=3D61f16601ba13a=
13f5234474957527494eae9ef04=0A=0ALog:=0A- Don't include gen_libglade.h from=
 php_libglade.h=0A- Adjust make files to remove extra gen_ prefix=0A=0AChan=
ged paths:=0A  M  ext/libglade/Makefile.frag=0A  M  ext/libglade/php_libgla=
de.h=0A=0A=0ADiff:=0A61f16601ba13a13f5234474957527494eae9ef04=0Adiff --git =
a/ext/libglade/Makefile.frag b/ext/libglade/Makefile.frag=0Aindex 7eb4e19..=
5b0c487 100644=0A--- a/ext/libglade/Makefile.frag=0A+++ b/ext/libglade/Make=
file.frag=0A@@ -2,7 +2,7 @@=0A $(builddir)/gen_libglade.c: $(srcdir)/libgla=
de.defs $(srcdir)/libglade.overrides=0A =09( \=0A      $(PHP) $(top_srcdir)=
/generator/generator.php \=0A-=09 =09-l $(@D)/gen_$(*F).log \=0A+=09 =09-l =
$(@D)/$(*F).log \=0A         -r ext/gtk+/atk-types.defs   \=0A         -r e=
xt/gtk+/pango-types.defs \=0A         -r ext/gtk+/gdk-types.defs   \=0A@@ -=
10,5 +10,5 @@ $(builddir)/gen_libglade.c: $(srcdir)/libglade.defs $(srcdir)=
/libglade.overrides=0A         -o ext/libglade/libglade.overrides \=0A     =
    -p Glade \=0A         -f $@ ext/libglade/libglade.defs \=0A-     && gre=
p -h "^PHP_GTK_EXPORT_CE" $@ | sed -e "s!^!extern !" > $(@D)/gen_$(*F).h \=
=0A+     && grep -h "^PHP_GTK_EXPORT_CE" $@ | sed -e "s!^!extern !" > $(@D)=
/$(*F).h \=0A =09)=0Adiff --git a/ext/libglade/php_libglade.h b/ext/libglad=
e/php_libglade.h=0Aindex 961dfa0..752a5f1 100644=0A--- a/ext/libglade/php_l=
ibglade.h=0A+++ b/ext/libglade/php_libglade.h=0A@@ -28,7 +28,6 @@=0A #if HA=
VE_LIBGLADE=0A =0A #include <glade/glade.h>=0A-#include "gen_libglade.h"=0A=
 =0A extern php_gtk_ext_entry libglade_ext_entry;=0A #define php_gtk_ext_li=
bglade_ptr &libglade_ext_entry=0A