diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | configure.in | 25 | ||||
| -rw-r--r-- | gdk/Makefile.am | 10 | ||||
| -rw-r--r-- | gtk/Makefile.am | 14 |
10 files changed, 83 insertions, 15 deletions
@@ -1,3 +1,10 @@ +Tue Dec 1 02:40:22 PST 1998 Manish Singh <yosh@gimp.org> + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am: Put -DFOO stuff into Makefile.am INCLUDES. + Separate vars for each, for granularity. + Tue Dec 1 02:19:54 1998 Tim Janik <timj@gtk.org> * gtk/gtkenums.h: fixed a stupid error of mine about the run type diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 01f5c5ffbf..b9e2b36c03 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Tue Dec 1 02:40:22 PST 1998 Manish Singh <yosh@gimp.org> + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am: Put -DFOO stuff into Makefile.am INCLUDES. + Separate vars for each, for granularity. + Tue Dec 1 02:19:54 1998 Tim Janik <timj@gtk.org> * gtk/gtkenums.h: fixed a stupid error of mine about the run type diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 01f5c5ffbf..b9e2b36c03 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Dec 1 02:40:22 PST 1998 Manish Singh <yosh@gimp.org> + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am: Put -DFOO stuff into Makefile.am INCLUDES. + Separate vars for each, for granularity. + Tue Dec 1 02:19:54 1998 Tim Janik <timj@gtk.org> * gtk/gtkenums.h: fixed a stupid error of mine about the run type diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 01f5c5ffbf..b9e2b36c03 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Tue Dec 1 02:40:22 PST 1998 Manish Singh <yosh@gimp.org> + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am: Put -DFOO stuff into Makefile.am INCLUDES. + Separate vars for each, for granularity. + Tue Dec 1 02:19:54 1998 Tim Janik <timj@gtk.org> * gtk/gtkenums.h: fixed a stupid error of mine about the run type diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 01f5c5ffbf..b9e2b36c03 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Dec 1 02:40:22 PST 1998 Manish Singh <yosh@gimp.org> + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am: Put -DFOO stuff into Makefile.am INCLUDES. + Separate vars for each, for granularity. + Tue Dec 1 02:19:54 1998 Tim Janik <timj@gtk.org> * gtk/gtkenums.h: fixed a stupid error of mine about the run type diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 01f5c5ffbf..b9e2b36c03 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Dec 1 02:40:22 PST 1998 Manish Singh <yosh@gimp.org> + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am: Put -DFOO stuff into Makefile.am INCLUDES. + Separate vars for each, for granularity. + Tue Dec 1 02:19:54 1998 Tim Janik <timj@gtk.org> * gtk/gtkenums.h: fixed a stupid error of mine about the run type diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 01f5c5ffbf..b9e2b36c03 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Dec 1 02:40:22 PST 1998 Manish Singh <yosh@gimp.org> + + * configure.in + * gdk/Makefile.am + * gtk/Makefile.am: Put -DFOO stuff into Makefile.am INCLUDES. + Separate vars for each, for granularity. + Tue Dec 1 02:19:54 1998 Tim Janik <timj@gtk.org> * gtk/gtkenums.h: fixed a stupid error of mine about the run type diff --git a/configure.in b/configure.in index 18b6e73339..3d01e851d3 100644 --- a/configure.in +++ b/configure.in @@ -71,12 +71,12 @@ AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ]) if test "x$enable_debug" = "xyes"; then test "$cflags_set" = set || CFLAGS="$CFLAGS -g" - CFLAGS="$CFLAGS -DG_ENABLE_DEBUG" + GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG" else if test "x$enable_debug" = "xno"; then - CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DGTK_NO_CHECK_CASTS" + GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DGTK_NO_CHECK_CASTS" else - CFLAGS="$CFLAGS -DGTK_NO_CHECK_CASTS" + GTK_DEBUG_FLAGS="-DGTK_NO_CHECK_CASTS" fi fi @@ -164,7 +164,7 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;], AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)]))) if test "x$enable_xim" = "xyes"; then - CFLAGS="$CFLAGS -DUSE_XIM" + GTK_XIM_FLAGS="-DUSE_XIM" fi if test x$with_glib = xyes ; then @@ -291,21 +291,21 @@ fi # Threads -CFLAGS="$saved_cflags" -LDFLAGS="$saved_ldflags" - if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then AC_CHECK_LIB(pthread, pthread_attr_init, [AC_DEFINE(USE_PTHREADS) x_libs="$x_libs -lpthread" - CFLAGS="$CFLAGS -D_REENTRANT"], + GTK_THREAD_FLAGS="-D_REENTRANT"], # AIX has libpthreads, cause they're special. Special friends (TM) AC_CHECK_LIB(pthreads, pthread_attr_init, [AC_DEFINE(USE_PTHREADS) x_libs="$x_libs -lpthreads" - CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"])) + GTK_THREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE"])) fi +CFLAGS="$saved_cflags" +LDFLAGS="$saved_ldflags" + AC_SUBST(x_cflags) AC_SUBST(x_includes) AC_SUBST(x_ldflags) @@ -404,7 +404,7 @@ need_x_locale=yes) AC_MSG_RESULT($need_x_locale) if test $need_x_locale = yes; then - CFLAGS="$CFLAGS -DX_LOCALE" + GTK_LOCALE_CFLAGS="-DX_LOCALE" fi # Checks for header files. @@ -493,6 +493,11 @@ fi AC_MSG_RESULT($gtk_ok) AC_SUBST(GDK_WLIBS) +AC_SUBST(GTK_DEBUG_FLAGS) +AC_SUBST(GTK_XIM_FLAGS) +AC_SUBST(GTK_LOCALE_FLAGS) +AC_SUBST(GTK_THREAD_FLAGS) + AC_OUTPUT([ Makefile gtk-config diff --git a/gdk/Makefile.am b/gdk/Makefile.am index d67d38661e..ec4f78af9a 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -4,7 +4,15 @@ gdkincludedir = $(includedir)/gdk lib_LTLIBRARIES = libgdk.la -INCLUDES = -DG_LOG_DOMAIN=\"Gdk\" -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ +INCLUDES = \ + -DG_LOG_DOMAIN=\"Gdk\" \ + -I$(top_srcdir) \ + @GTK_DEBUG_FLAGS@ \ + @GTK_XIM_FLAGS@ \ + @GTK_LOCALE_FLAGS@ \ + @GTK_THREAD_FLAGS@ \ + @GLIB_CFLAGS@ \ + @x_cflags@ libgdk_la_SOURCES = \ gdk.c \ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 0561364419..4643c56103 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -340,10 +340,16 @@ EXTRA_DIST = \ circles.xbm INCLUDES = \ - -DG_LOG_DOMAIN=\"Gtk\" \ - -DGTK_EXE_PREFIX=\"$(exec_prefix)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ + -DG_LOG_DOMAIN=\"Gtk\" \ + -DGTK_EXE_PREFIX=\"$(exec_prefix)\" \ + -DGTK_DATA_PREFIX=\"$(prefix)\" \ + -I$(top_srcdir) \ + @GTK_DEBUG_FLAGS@ \ + @GTK_XIM_FLAGS@ \ + @GTK_LOCALE_FLAGS@ \ + @GTK_THREAD_FLAGS@ \ + @GLIB_CFLAGS@ \ + @x_cflags@ noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb testdnd simple |