diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gdk/Makefile.am | 3 | ||||
| -rw-r--r-- | gtk/Makefile.am | 4 |
9 files changed, 45 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2001-10-29 jacob berkman <jacob@ximian.com> + + * gdk/Makefile.am (LDFLAGS): + * gtk/Makefile.am (LDFLAGS): automake doesn't support conditionalized + LDFLAGS, so put win32 flags in here + Mon Oct 29 15:41:58 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index eadf46f555..7b7e196d45 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-10-29 jacob berkman <jacob@ximian.com> + + * gdk/Makefile.am (LDFLAGS): + * gtk/Makefile.am (LDFLAGS): automake doesn't support conditionalized + LDFLAGS, so put win32 flags in here + Mon Oct 29 15:41:58 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index eadf46f555..7b7e196d45 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-10-29 jacob berkman <jacob@ximian.com> + + * gdk/Makefile.am (LDFLAGS): + * gtk/Makefile.am (LDFLAGS): automake doesn't support conditionalized + LDFLAGS, so put win32 flags in here + Mon Oct 29 15:41:58 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index eadf46f555..7b7e196d45 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-10-29 jacob berkman <jacob@ximian.com> + + * gdk/Makefile.am (LDFLAGS): + * gtk/Makefile.am (LDFLAGS): automake doesn't support conditionalized + LDFLAGS, so put win32 flags in here + Mon Oct 29 15:41:58 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index eadf46f555..7b7e196d45 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-10-29 jacob berkman <jacob@ximian.com> + + * gdk/Makefile.am (LDFLAGS): + * gtk/Makefile.am (LDFLAGS): automake doesn't support conditionalized + LDFLAGS, so put win32 flags in here + Mon Oct 29 15:41:58 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index eadf46f555..7b7e196d45 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-10-29 jacob berkman <jacob@ximian.com> + + * gdk/Makefile.am (LDFLAGS): + * gtk/Makefile.am (LDFLAGS): automake doesn't support conditionalized + LDFLAGS, so put win32 flags in here + Mon Oct 29 15:41:58 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index eadf46f555..7b7e196d45 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-10-29 jacob berkman <jacob@ximian.com> + + * gdk/Makefile.am (LDFLAGS): + * gtk/Makefile.am (LDFLAGS): automake doesn't support conditionalized + LDFLAGS, so put win32 flags in here + Mon Oct 29 15:41:58 2001 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): Darn. diff --git a/gdk/Makefile.am b/gdk/Makefile.am index debc9860eb..56d8b48e93 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -70,6 +70,7 @@ LDFLAGS = @STRIP_BEGIN@ \ $(no_undefined) \ @LIBTOOL_EXPORT_OPTIONS@ \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ + $(gdk_win32_symbols) \ @GDK_DEP_LIBS@ \ @STRIP_END@ @@ -174,8 +175,6 @@ libgdk_win32_1_3_la_LIBADD = \ libgdk_win32_include_HEADERS = $(gdk_headers) libgdk_win32_1_3_la_SOURCES = $(gdk_c_sources) gdkenumtypes.c -libgdk_win32_1_3_la_LDFLAGS = $(gdk_win32_symbols) - endif # now define the real one to workaround automake's mishandling diff --git a/gtk/Makefile.am b/gtk/Makefile.am index f80b6e58e1..bef5917e0a 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -28,7 +28,7 @@ endif if OS_WIN32 gtk_def = gtk.def -gtk_win32_symbols = -export-symbols $(gtk_def) +gtk_win32_symbols = -export-symbols $(gtk_def) -lwsock32 gtk_win32res_lo = gtk-win32res.lo @@ -72,6 +72,7 @@ LDFLAGS = @STRIP_BEGIN@ \ @LIBTOOL_EXPORT_OPTIONS@ \ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \ $(top_builddir)/gdk/@gdktargetlib@ \ + $(gtk_win32_symbols) \ @GTK_DEP_LIBS@ \ @STRIP_END@ @@ -547,7 +548,6 @@ if USE_WIN32 libgtk_win32_includedir = $(includedir)/gtk-2.0/gtk libgtk_win32_include_HEADERS = $(gtk_target_headers) libgtk_win32_1_3_la_SOURCES = $(gtk_target_sources) -libgtk_win32_1_3_la_LDFLAGS = $(gtk_win32_symbols) -lwsock32 libgtk_win32_1_3_la_LIBADD = $(gtk_win32res_lo) libgtk_win32_1_3_la_DEPENDENCIES = $(gtk_def) $(gtk_win32res_lo) endif |