AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

configure.in gdk/Makefile.am gtk/Makefile.am gtk/gtkselection.c

Browse Source 
2001-09-20  Sven Neumann  <sven@gimp.org>

	* configure.in
	* gdk/Makefile.am
	* gtk/Makefile.am
	* gtk/gtkselection.c
	* gtk/gtktreeview.c
	* gtk/gtkwindow.c: removed remaining traces of nanox GDK backend.
This commit is contained in:
Sven Neumann 2001-09-20 16:31:21 +00:00 committed by Sven Neumann
parent 6adbb34d52
commit b728e2eaba
13 changed files with 70 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2001-09-20 Sven Neumann <sven@gimp.org>
* configure.in
* gdk/Makefile.am
* gtk/Makefile.am
* gtk/gtkselection.c
* gtk/gtktreeview.c
* gtk/gtkwindow.c: removed remaining traces of nanox GDK backend.
Thu Sep 20 11:19:42 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
2001-09-20 Sven Neumann <sven@gimp.org>
* configure.in
* gdk/Makefile.am
* gtk/Makefile.am
* gtk/gtkselection.c
* gtk/gtktreeview.c
* gtk/gtkwindow.c: removed remaining traces of nanox GDK backend.
Thu Sep 20 11:19:42 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2001-09-20 Sven Neumann <sven@gimp.org>
* configure.in
* gdk/Makefile.am
* gtk/Makefile.am
* gtk/gtkselection.c
* gtk/gtktreeview.c
* gtk/gtkwindow.c: removed remaining traces of nanox GDK backend.
Thu Sep 20 11:19:42 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
2001-09-20 Sven Neumann <sven@gimp.org>
* configure.in
* gdk/Makefile.am
* gtk/Makefile.am
* gtk/gtkselection.c
* gtk/gtktreeview.c
* gtk/gtkwindow.c: removed remaining traces of nanox GDK backend.
Thu Sep 20 11:19:42 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
2001-09-20 Sven Neumann <sven@gimp.org>
* configure.in
* gdk/Makefile.am
* gtk/Makefile.am
* gtk/gtkselection.c
* gtk/gtktreeview.c
* gtk/gtkwindow.c: removed remaining traces of nanox GDK backend.
Thu Sep 20 11:19:42 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
2001-09-20 Sven Neumann <sven@gimp.org>
* configure.in
* gdk/Makefile.am
* gtk/Makefile.am
* gtk/gtkselection.c
* gtk/gtktreeview.c
* gtk/gtkwindow.c: removed remaining traces of nanox GDK backend.
Thu Sep 20 11:19:42 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2001-09-20 Sven Neumann <sven@gimp.org>
* configure.in
* gdk/Makefile.am
* gtk/Makefile.am
* gtk/gtkselection.c
* gtk/gtktreeview.c
* gtk/gtkwindow.c: removed remaining traces of nanox GDK backend.
Thu Sep 20 11:19:42 2001 Owen Taylor <otaylor@redhat.com>
* gdk/gdkpango.c (gdk_pango_layout_line_get_clip_region): Add

26
configure.in
View File

@ -131,13 +131,13 @@ AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ])
gdktarget=x11
gdktargetlib=libgdk-x11-1.3.la
gtktargetlib=libgtk-x11-1.3.la
AC_ARG_WITH(gdktarget, [ --with-gdktarget=[x11/nanox/linux-fb] select GDK target [default=x11] ],
AC_ARG_WITH(gdktarget, [ --with-gdktarget=[x11/linux-fb] select GDK target [default=x11] ],
gdktarget=$with_gdktarget)
AC_SUBST(gdktarget)
case $gdktarget in
x11|nanox|linux-fb) ;;
*) AC_MSG_ERROR([Invalid target for GDK: use x11, nanox or linux-fb.]);;
x11|linux-fb) ;;
*) AC_MSG_ERROR([Invalid target for GDK: use x11 or linux-fb.]);;
esac
AC_ARG_ENABLE(shadowfb, [ --disable-shadowfb disable shadowfb support for linux-fb],,enable_shadowfb=yes)
@ -831,19 +831,6 @@ AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_CFLAGS)
AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
if test "x$gdktarget" = "xnanox"; then
AC_CHECK_LIB(nano-X, GrOpen,,AC_MSG_ERROR([nano-X libraries not found.]))
# nano-X may require additional libraries
GDK_EXTRA_LIBS="-lnano-X $GDK_EXTRA_LIBS"
gdktargetlib="libgdk-nanox-1.3.la"
gtktargetlib="libgtk-nanox-1.3.la"
AM_CONDITIONAL(USE_NANOX, true)
else
AM_CONDITIONAL(USE_NANOX, false)
fi
if test "x$gdktarget" = "xlinux-fb"; then
gdktargetlib="libgdk-linux-fb-1.3.la"
gtktargetlib="libgtk-linux-fb-1.3.la"
@ -983,7 +970,7 @@ AC_SUBST(GTK_XIM_FLAGS)
# Checks for gtk-doc and docbook-tools
##################################################
AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ])
if test "x$with_html_dir" = "x" ; then
HTML_DIR='${datadir}/gtk-doc/html'
@ -1014,7 +1001,7 @@ AC_CHECK_PROG(DB2HTML, db2html, true, false)
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
dnl Let people disable the gtk-doc stuff.
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
if test x$enable_gtk_doc = xauto ; then
if test x$GTKDOC = xtrue ; then
@ -1094,9 +1081,6 @@ esac
if test "x$gdktarget" = "xx11" ; then
gdk_windowing='
#define GDK_WINDOWING_X11'
elif test "x$gdktarget" = "xnanox" ; then
gdk_windowing='
#define GDK_WINDOWING_NANOX'
elif test "x$gdktarget" = "xlinux-fb" ; then
gdk_windowing='
#define GDK_WINDOWING_FB

12
gdk/Makefile.am
View File

@ -117,16 +117,6 @@ libgdk_x11_include_HEADERS = $(gdk_headers)
libgdk_x11_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
endif
if USE_NANOX
libgdk_nanox_includedir = $(includedir)/gtk-2.0/gdk
libgdk_nanox_1_3_la_LIBADD = \
$(gtarget)/libgdk-$(gtarget).la
libgdk_nanox_include_HEADERS = $(gdk_headers)
libgdk_nanox_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c
endif
if USE_LINUX_FB
libgdk_linux_fb_includedir = $(includedir)/gtk-2.0/gdk
@ -140,7 +130,7 @@ endif
# now define the real one to workaround automake's mishandling
lib_LTLIBRARIES = $(extra)
EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-nanox-1.3.la libgdk-linux-fb-1.3.la
EXTRA_LTLIBRARIES = libgdk-x11-1.3.la libgdk-linux-fb-1.3.la
MAINTAINERCLEANFILES =
EXTRA_HEADERS =

7
gtk/Makefile.am
View File

@ -500,17 +500,12 @@ libgtk_x11_includedir = $(includedir)/gtk-2.0/gtk
libgtk_x11_include_HEADERS = $(gtk_target_headers)
libgtk_x11_1_3_la_SOURCES = $(gtk_target_sources)
endif
if USE_NANOX
libgtk_nanox_includedir = $(includedir)/gtk-2.0/gtk
libgtk_nanox_include_HEADERS = $(gtk_target_headers)
libgtk_nanox_1_3_la_SOURCES = $(gtk_target_sources)
endif
if USE_LINUX_FB
libgtk_linux_fb_includedir = $(includedir)/gtk-2.0/gtk
libgtk_linux_fb_include_HEADERS = $(gtk_target_headers)
libgtk_linux_fb_1_3_la_SOURCES = $(gtk_target_sources)
endif
EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la
EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-linux-fb-1.3.la
# We create a dummy theme for the default GTK+ theme

2
gtk/gtkselection.c
View File

@ -61,8 +61,6 @@
#include "win32/gdkwin32.h" /* For gdk_window_lookup() */
#elif defined (GDK_WINDOWING_FB)
#include "linux-fb/gdkfb.h" /* For gdk_window_lookup() */
#elif defined (GDK_WINDOWING_NANOX)
#include "nanox/gdkprivate-nanox.h" /* For gdk_window_lookup() */
#endif
#include "gtkmain.h"

2
gtk/gtktreeview.c
View File

@ -44,8 +44,6 @@
#include "win32/gdkwin32.h"
#elif defined(GDK_WINDOWING_FB)
#include "linux-fb/gdkfb.h"
#elif defined (GDK_WINDOWING_NANOX)
#include "nanox/gdkprivate-nanox.h"
#endif

2
gtk/gtkwindow.c
View File

@ -33,8 +33,6 @@
#include "x11/gdkx.h"
#elif defined (GDK_WINDOWING_WIN32)
#include "win32/gdkwin32.h"
#elif defined (GDK_WINDOWING_NANOX)
#include "nanox/gdkprivate-nanox.h"
#elif defined (GDK_WINDOWING_FB)
#include "linux-fb/gdkfb.h"
#endif