$NetBSD: patch-ac,v 1.2 1999/02/19 14:22:47 rh Exp $ --- glib/Makefile.in.orig Mon Sep 21 06:20:33 1998 +++ glib/Makefile.in Tue Feb 16 15:04:10 1999 @@ -74,11 +74,11 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ -configincludedir = $(pkglibdir)/include +configincludedir = @includedir@ -lib_LTLIBRARIES = libglib.la +lib_LTLIBRARIES = libglib10.la -libglib_la_SOURCES = \ +libglib10_la_SOURCES = \ garray.c \ gcache.c \ gerror.c \ @@ -100,12 +100,12 @@ configinclude_DATA = \ glibconfig.h -libglib_la_LDFLAGS = -version-info $(GLIB_MAJOR_VERSION):$(GLIB_MICRO_VERSION):0 +libglib10_la_LDFLAGS = -version-info $(GLIB_MAJOR_VERSION):$(GLIB_MICRO_VERSION):0 INCLUDES = -I$(top_srcdir) noinst_PROGRAMS = testglib -testglib_LDADD = libglib.la +testglib_LDADD = libglib10.la ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = glibconfig.h @@ -117,15 +117,15 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libglib_la_LIBADD = -libglib_la_OBJECTS = garray.lo gcache.lo gerror.lo ghash.lo glist.lo \ +libglib10_la_LIBADD = +libglib10_la_OBJECTS = garray.lo gcache.lo gerror.lo ghash.lo glist.lo \ gmem.lo gmessages.lo gprimes.lo gslist.lo gtimer.lo gtree.lo gstring.lo \ gscanner.lo gutils.lo PROGRAMS = $(noinst_PROGRAMS) testglib_SOURCES = testglib.c testglib_OBJECTS = testglib.o -testglib_DEPENDENCIES = libglib.la +testglib_DEPENDENCIES = libglib10.la testglib_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -145,8 +145,8 @@ TAR = tar GZIP = --best -SOURCES = $(libglib_la_SOURCES) testglib.c -OBJECTS = $(libglib_la_OBJECTS) testglib.o +SOURCES = $(libglib10_la_SOURCES) testglib.c +OBJECTS = $(libglib10_la_OBJECTS) testglib.o all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) glibconfig.h @@ -251,8 +251,8 @@ maintainer-clean-libtool: -libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS) +libglib10.la: $(libglib10_la_OBJECTS) $(libglib10_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libglib10_la_LDFLAGS) $(libglib10_la_OBJECTS) $(libglib10_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: