From db6a3f861282615ae9196336826c22a4de4f53e2 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Mon, 28 Dec 2009 17:00:58 +0000 Subject: [PATCH] 2009-12-28 Mike Kestner * glib/glue/Makefile.am: fix a copy/paste issue. * pango/glue/Makefile.am: move glue lib to -3 like the others. [Fixes #561148] svn path=/trunk/gtk-sharp/; revision=148920 --- ChangeLog | 6 ++++++ glib/glue/Makefile.am | 4 ++-- pango/glue/Makefile.am | 14 +++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc1c83288..9e111b5f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-12-28 Mike Kestner + + * glib/glue/Makefile.am: fix a copy/paste issue. + * pango/glue/Makefile.am: move glue lib to -3 like the others. + [Fixes #561148] + 2009-11-30 Mike Kestner * */Makefile.am: standardize on - options over / options for diff --git a/glib/glue/Makefile.am b/glib/glue/Makefile.am index 3f6ab246d..d27d08387 100644 --- a/glib/glue/Makefile.am +++ b/glib/glue/Makefile.am @@ -11,8 +11,8 @@ libglibsharpglue_3_la_LIBADD = $(GLIB_LIBS) INCLUDES = $(GLIB_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) -libgtksharpglue.dll: $(libgtksharpglue_3_la_OBJECTS) libgtksharpglue.rc libgtksharpglue.def - ./build-dll libgtksharpglue-3 $(VERSION) +libglibsharpglue.dll: $(libglibsharpglue_3_la_OBJECTS) libglibsharpglue.rc libglibsharpglue.def + ./build-dll libglibsharpglue-3 $(VERSION) CLEANFILES = lib*.a lib*.dll diff --git a/pango/glue/Makefile.am b/pango/glue/Makefile.am index f635144d2..9333baec0 100644 --- a/pango/glue/Makefile.am +++ b/pango/glue/Makefile.am @@ -1,19 +1,19 @@ -lib_LTLIBRARIES = libpangosharpglue-2.la +lib_LTLIBRARIES = libpangosharpglue-3.la -libpangosharpglue_2_la_SOURCES = +libpangosharpglue_3_la_SOURCES = -nodist_libpangosharpglue_2_la_SOURCES = generated.c +nodist_libpangosharpglue_3_la_SOURCES = generated.c # Adding a new glue file? -libpangosharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined +libpangosharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined -libpangosharpglue_2_la_LIBADD = $(PANGO_LIBS) +libpangosharpglue_3_la_LIBADD = $(PANGO_LIBS) INCLUDES = $(PANGO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) -libpangosharpglue.dll: $(libpangosharpglue_2_la_OBJECTS) libpangosharpglue.rc libpangosharpglue.def - ./build-dll libpangosharpglue-2 $(VERSION) +libpangosharpglue.dll: $(libpangosharpglue_3_la_OBJECTS) libpangosharpglue.rc libpangosharpglue.def + ./build-dll libpangosharpglue-3 $(VERSION) CLEANFILES = lib*.a lib*.dll