diff --git a/ChangeLog b/ChangeLog index 14fe06306e..ad861f1304 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jun 7 15:44:42 2000 Owen Taylor + + * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping + GTK+ from even building at all + + * gdk/Makefile.am (gdk_c_sources): Fix up some indentation issues. + Mon Jun 5 19:32:53 CEST 2000 Paolo Molaro * configure.in, gtk-config.in, gdk/Makefile.am, gdk/*/Makefile.am, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 14fe06306e..ad861f1304 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Wed Jun 7 15:44:42 2000 Owen Taylor + + * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping + GTK+ from even building at all + + * gdk/Makefile.am (gdk_c_sources): Fix up some indentation issues. + Mon Jun 5 19:32:53 CEST 2000 Paolo Molaro * configure.in, gtk-config.in, gdk/Makefile.am, gdk/*/Makefile.am, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 14fe06306e..ad861f1304 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Jun 7 15:44:42 2000 Owen Taylor + + * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping + GTK+ from even building at all + + * gdk/Makefile.am (gdk_c_sources): Fix up some indentation issues. + Mon Jun 5 19:32:53 CEST 2000 Paolo Molaro * configure.in, gtk-config.in, gdk/Makefile.am, gdk/*/Makefile.am, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 14fe06306e..ad861f1304 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed Jun 7 15:44:42 2000 Owen Taylor + + * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping + GTK+ from even building at all + + * gdk/Makefile.am (gdk_c_sources): Fix up some indentation issues. + Mon Jun 5 19:32:53 CEST 2000 Paolo Molaro * configure.in, gtk-config.in, gdk/Makefile.am, gdk/*/Makefile.am, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 14fe06306e..ad861f1304 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Jun 7 15:44:42 2000 Owen Taylor + + * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping + GTK+ from even building at all + + * gdk/Makefile.am (gdk_c_sources): Fix up some indentation issues. + Mon Jun 5 19:32:53 CEST 2000 Paolo Molaro * configure.in, gtk-config.in, gdk/Makefile.am, gdk/*/Makefile.am, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 14fe06306e..ad861f1304 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Jun 7 15:44:42 2000 Owen Taylor + + * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping + GTK+ from even building at all + + * gdk/Makefile.am (gdk_c_sources): Fix up some indentation issues. + Mon Jun 5 19:32:53 CEST 2000 Paolo Molaro * configure.in, gtk-config.in, gdk/Makefile.am, gdk/*/Makefile.am, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 14fe06306e..ad861f1304 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Jun 7 15:44:42 2000 Owen Taylor + + * gtk/Makefile.am (LDFLAGS): Add missing backslash that was keeping + GTK+ from even building at all + + * gdk/Makefile.am (gdk_c_sources): Fix up some indentation issues. + Mon Jun 5 19:32:53 CEST 2000 Paolo Molaro * configure.in, gtk-config.in, gdk/Makefile.am, gdk/*/Makefile.am, diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 722453088b..6f23194a3a 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -26,16 +26,16 @@ gtarget=@gdktarget@ # libtool stuff: set version and export symbols for resolving # since automake doesn't support conditionalized libsomething_la_LDFLAGS # we use the general approach here -LDFLAGS = @STRIP_BEGIN@ \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) \ - -export-dynamic \ - -rpath @prefix@/lib \ - @PANGO_LIBS@ \ - @GLIB_DEPLIBS@ \ - @more_ldflags@ \ - @more_libs@ \ - -lm \ +LDFLAGS = @STRIP_BEGIN@ \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) \ + -export-dynamic \ + -rpath @prefix@/lib \ + @PANGO_LIBS@ \ + @GLIB_DEPLIBS@ \ + @more_ldflags@ \ + @more_libs@ \ + -lm \ @STRIP_END@ # @@ -74,26 +74,26 @@ gdk_public_h_sources = @STRIP_BEGIN@ \ gdkvisual.h \ gdkwindow.h \ @STRIP_END@ -gdk_c_sources = @STRIP_BEGIN@ \ - gdk.c \ - gdkcolor.c \ - gdkcursor.c \ - gdkdraw.c \ - gdkevents.c \ - gdkfont.c \ - gdkgc.c \ - gdkglobals.c \ - gdkkeyuni.c \ - gdkimage.c \ - gdkinternals.h \ - gdkpango.c \ +gdk_c_sources = @STRIP_BEGIN@ \ + gdk.c \ + gdkcolor.c \ + gdkcursor.c \ + gdkdraw.c \ + gdkevents.c \ + gdkfont.c \ + gdkgc.c \ + gdkglobals.c \ + gdkkeyuni.c \ + gdkimage.c \ + gdkinternals.h \ + gdkpango.c \ gdkpoly-generic.h \ gdkpolyreg-generic.c \ - gdkrgb.c \ - gdkrectangle.c \ + gdkrgb.c \ + gdkrectangle.c \ gdkregion-generic.c \ gdkregion-generic.h \ - gdkwindow.c \ + gdkwindow.c \ @STRIP_END@ # diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 44c3d56502..cb59e29e4f 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -28,7 +28,7 @@ LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ - -rpath @prefix@/lib + -rpath @prefix@/lib \ @PANGO_LIBS@ \ @GLIB_DEPLIBS@ \ @more_ldflags@ \