Update of /cvsroot/openvrml/openvrml/lib/gtkglext/gdk
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7908/gdk
Modified Files:
Tag: OpenVRML-GtkPlug-BRANCH
Makefile.am
Log Message:
Fixed references to gdkglversion.h to work with non-srcdir builds.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/Makefile.am,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Makefile.am 27 Sep 2006 06:32:34 -0000 1.1.1.1.2.1
--- Makefile.am 30 Sep 2006 03:17:19 -0000 1.1.1.1.2.2
***************
*** 63,71 ****
# setup source file variables
#
gdkglext_public_h_sources = \
gdkgl.h \
gdkgldefs.h \
- gdkglversion.h \
gdkgltokens.h \
gdkgltypes.h \
--- 63,71 ----
# setup source file variables
#
+ gdkglext_configure_generated_public_h_source = gdkglversion.h
gdkglext_public_h_sources = \
gdkgl.h \
gdkgldefs.h \
gdkgltokens.h \
gdkgltypes.h \
***************
*** 103,108 ****
gdkglext_headers = \
! $(gdkglext_public_h_sources) \
! $(gdkglext_built_public_h_sources) \
gdkgldebug.h
--- 103,109 ----
gdkglext_headers = \
! $(gdkglext_public_h_sources) \
! $(gdkglext_built_public_h_sources) \
! $(gdkglext_configure_generated_public_h_source) \
gdkgldebug.h
***************
*** 155,169 ****
@true
stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile
! ( cd $(srcdir) && glib-mkenums \
--fhead "#ifndef __GDK_GL_ENUM_TYPES_H__\n#define __GDK_GL_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* __GDK_GL_ENUM_TYPES_H__ */" \
! $(gdkglext_public_h_sources) ) >> xgen-geth \
&& (cmp -s xgen-geth gdkglenumtypes.h || cp xgen-geth gdkglenumtypes.h ) \
&& rm -f xgen-geth \
&& echo timestamp > $(@F)
gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile
! ( cd $(srcdir) && glib-mkenums \
--fhead "#include \"gdkgl.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--- 156,170 ----
@true
stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile
! builddir=`pwd`; ( cd $(srcdir) && glib-mkenums \
--fhead "#ifndef __GDK_GL_ENUM_TYPES_H__\n#define __GDK_GL_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* __GDK_GL_ENUM_TYPES_H__ */" \
! $(gdkglext_public_h_sources) $${builddir}/$(gdkglext_configure_generated_public_h_source) ) >> xgen-geth \
&& (cmp -s xgen-geth gdkglenumtypes.h || cp xgen-geth gdkglenumtypes.h ) \
&& rm -f xgen-geth \
&& echo timestamp > $(@F)
gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile
! builddir=`pwd`; ( cd $(srcdir) && glib-mkenums \
--fhead "#include \"gdkgl.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
***************
*** 171,175 ****
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
! $(gdkglext_public_h_sources) ) > xgen-getc \
&& cp xgen-getc $@ \
&& rm -f xgen-getc
--- 172,176 ----
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
! $(gdkglext_public_h_sources) $${builddir}/$(gdkglext_configure_generated_public_h_source) ) > xgen-getc \
&& cp xgen-getc $@ \
&& rm -f xgen-getc
|
