[openvrml-commit] openvrml/lib/gtkglext/gdk Makefile.am, 1.1.1.1, 1.1.1.1.2.1 gdkglconfig.c, 1.1.1.1, 1.1.1.1.2.1

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/lib/gtkglext/gdk
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17409/gdk

Modified Files:
      Tag: OpenVRML-GtkPlug-BRANCH
	Makefile.am gdkglconfig.c 
Log Message:
Merged changes to GtkGLExt.

Index: gdkglconfig.c
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/gdkglconfig.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** gdkglconfig.c	27 Sep 2006 00:16:06 -0000	1.1.1.1
--- gdkglconfig.c	27 Sep 2006 06:32:34 -0000	1.1.1.1.2.1
***************
*** 34,41 ****
--- 34,47 ----
  gdk_gl_config_get_type (void)
  {
+   static const char type_name[] = "GdkGLConfig";
    static GType type = 0;
  
    if (!type)
      {
+       type = g_type_from_name(type_name);
+     }
+ 
+   if (!type)
+     {
        static const GTypeInfo type_info = {
          sizeof (GdkGLConfigClass),
***************
*** 51,55 ****
  
        type = g_type_register_static (G_TYPE_OBJECT,
!                                      "GdkGLConfig",
                                       &type_info, 0);
      }
--- 57,61 ----
  
        type = g_type_register_static (G_TYPE_OBJECT,
!                                      type_name,
                                       &type_info, 0);
      }

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/lib/gtkglext/gdk/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** Makefile.am	27 Sep 2006 00:16:06 -0000	1.1.1.1
--- Makefile.am	27 Sep 2006 06:32:34 -0000	1.1.1.1.2.1
***************
*** 124,132 ****
  
  gdkglextincludedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk
! gdkglextinclude_HEADERS = $(gdkglext_headers)
  
  INCLUDES = $(common_includes)
  
! lib_LTLIBRARIES = $(gdkglext_targetlib)
  
  EXTRA_LTLIBRARIES = \
--- 124,132 ----
  
  gdkglextincludedir = $(includedir)/gtkglext-@GTKGLEXT_API_VERSION@/gdk
! noinst_HEADERS = $(gdkglext_headers)
  
  INCLUDES = $(common_includes)
  
! noinst_LTLIBRARIES = $(gdkglext_targetlib)
  
  EXTRA_LTLIBRARIES = \
***************
*** 147,159 ****
  	$(gdkglext_built_sources)
  
! DISTCLEANFILES = $(stamp_files)
! 
! MAINTAINERCLEANFILES = \
! 	$(gdkglext_built_sources)
  
  # Generate built header without using automake BUILT_SOURCES
  $(libgdkglext_x11_@API_MJ@_@API_MI@_la_OBJECTS) $(libgdkglext_win32_@API_MJ@_@API_MI@_la_OBJECTS): $(gdkglext_built_public_h_sources)
  
! $(srcdir)/gdkglenumtypes.h: stamp-gdkglenumtypes-h
  	@true
  stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile
--- 147,156 ----
  	$(gdkglext_built_sources)
  
! DISTCLEANFILES = $(stamp_files) $(gdkglext_built_sources)
  
  # Generate built header without using automake BUILT_SOURCES
  $(libgdkglext_x11_@API_MJ@_@API_MI@_la_OBJECTS) $(libgdkglext_win32_@API_MJ@_@API_MI@_la_OBJECTS): $(gdkglext_built_public_h_sources)
  
! gdkglenumtypes.h: stamp-gdkglenumtypes-h
  	@true
  stamp-gdkglenumtypes-h: @REBUILD@ $(gdkglext_public_h_sources) Makefile
***************
*** 164,171 ****
  			--ftail "G_END_DECLS\n\n#endif /* __GDK_GL_ENUM_TYPES_H__ */" \
  		$(gdkglext_public_h_sources) ) >> xgen-geth \
! 	&& (cmp -s xgen-geth $(srcdir)/gdkglenumtypes.h || cp xgen-geth $(srcdir)/gdkglenumtypes.h ) \
  	&& rm -f xgen-geth \
  	&& echo timestamp > $(@F)
! $(srcdir)/gdkglenumtypes.c: @REBUILD@ $(gdkglext_public_h_sources) Makefile
  	( cd $(srcdir) && glib-mkenums \
  			--fhead "#include \"gdkgl.h\"" \
--- 161,168 ----
  			--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\"" \
***************
*** 175,179 ****
  			--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 $(srcdir)/gdkglenumtypes.c  \
  	&& rm -f xgen-getc
  
--- 172,176 ----
  			--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
  
***************
*** 184,193 ****
  #configexecinclude_DATA = gdkglext-config.h
  
- install-exec-local: gdkglext-config.h
- 	$(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
- 	file=$(DESTDIR)$(configexecincludedir)/gdkglext-config.h; \
- 	if test -r $$file && cmp -s gdkglext-config.h $$file; then :; \
- 	else $(INSTALL_DATA) gdkglext-config.h $$file; fi
- 
  gdkglext-config.h: stamp-gdkglext-config-h
  	@if test -f gdkglext-config.h; then :; \
--- 181,184 ----
***************
*** 199,209 ****
  
  DISTCLEANFILES += gdkglext-config.h stamp-gdkglext-config-h
- 
- #
- # Extra rules
- #
- 
- install-data-local: install-ms-lib
- 
- uninstall-local: uninstall-ms-lib
- 
--- 190,191 ----