1998-08-06 14:55:13 +00:00
|
|
|
--- Makefile.in.orig Thu Aug 6 01:16:42 1998
|
1998-08-14 11:15:01 +00:00
|
|
|
+++ Makefile.in Thu Aug 13 17:48:34 1998
|
|
|
|
@@ -77,17 +77,15 @@
|
1998-07-28 15:22:17 +00:00
|
|
|
RANLIB = @RANLIB@
|
|
|
|
VERSION = @VERSION@
|
|
|
|
|
|
|
|
-configincludedir = $(pkglibdir)/include
|
|
|
|
-
|
|
|
|
bin_SCRIPTS=glib-config
|
|
|
|
|
|
|
|
EXTRA_DIST = \
|
1998-08-14 11:15:01 +00:00
|
|
|
glib.m4 \
|
|
|
|
glib.spec
|
|
|
|
|
|
|
|
-lib_LTLIBRARIES = libglib-1.1.la
|
|
|
|
+lib_LTLIBRARIES = libglib11.la
|
|
|
|
|
|
|
|
-libglib_1_1_la_SOURCES = \
|
|
|
|
+libglib11_la_SOURCES = \
|
|
|
|
garray.c \
|
|
|
|
gcache.c \
|
|
|
|
gcompletion.c \
|
|
|
|
@@ -109,17 +107,15 @@
|
1998-07-28 15:22:17 +00:00
|
|
|
gutils.c
|
|
|
|
|
|
|
|
include_HEADERS = \
|
|
|
|
- glib.h
|
|
|
|
-
|
|
|
|
-configinclude_DATA = \
|
|
|
|
+ glib.h \
|
|
|
|
glibconfig.h
|
|
|
|
|
1998-08-06 14:55:13 +00:00
|
|
|
-libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
1998-08-14 11:15:01 +00:00
|
|
|
+libglib11_la_LDFLAGS = -version-info 0:2:0
|
1998-08-06 14:55:13 +00:00
|
|
|
|
|
|
|
INCLUDES = -I$(top_srcdir)
|
|
|
|
|
1998-08-14 11:15:01 +00:00
|
|
|
noinst_PROGRAMS = testglib
|
|
|
|
-testglib_LDADD = libglib-@LT_RELEASE@.la
|
|
|
|
+testglib_LDADD = libglib11.la
|
|
|
|
|
|
|
|
m4datadir = $(datadir)/aclocal
|
|
|
|
m4data_DATA = glib.m4
|
|
|
|
@@ -134,8 +130,8 @@
|
|
|
|
CPPFLAGS = @CPPFLAGS@
|
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
|
LIBS = @LIBS@
|
|
|
|
-libglib_1_1_la_LIBADD =
|
|
|
|
-libglib_1_1_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
|
|
|
|
+libglib11_la_LIBADD =
|
|
|
|
+libglib11_la_OBJECTS = garray.lo gcache.lo gcompletion.lo gdataset.lo \
|
|
|
|
gerror.lo ghash.lo glist.lo gmem.lo gmessages.lo gnode.lo gprimes.lo \
|
|
|
|
gslist.lo gtimer.lo gtree.lo grel.lo gstring.lo gstrfuncs.lo \
|
|
|
|
gscanner.lo gutils.lo
|
|
|
|
@@ -143,7 +139,7 @@
|
|
|
|
|
|
|
|
testglib_SOURCES = testglib.c
|
|
|
|
testglib_OBJECTS = testglib.o
|
|
|
|
-testglib_DEPENDENCIES = libglib-@LT_RELEASE@.la
|
|
|
|
+testglib_DEPENDENCIES = libglib11.la
|
|
|
|
testglib_LDFLAGS =
|
|
|
|
SCRIPTS = $(bin_SCRIPTS)
|
|
|
|
|
1998-08-06 14:55:13 +00:00
|
|
|
@@ -151,7 +147,7 @@
|
1998-07-28 15:22:17 +00:00
|
|
|
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
|
|
|
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
|
|
|
|
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
|
|
|
|
-DATA = $(configinclude_DATA) $(m4data_DATA)
|
|
|
|
+DATA = $(m4data_DATA)
|
|
|
|
|
|
|
|
HEADERS = $(include_HEADERS)
|
|
|
|
|
1998-08-14 11:15:01 +00:00
|
|
|
@@ -165,8 +161,8 @@
|
|
|
|
|
|
|
|
TAR = tar
|
|
|
|
GZIP = --best
|
|
|
|
-SOURCES = $(libglib_1_1_la_SOURCES) testglib.c
|
|
|
|
-OBJECTS = $(libglib_1_1_la_OBJECTS) testglib.o
|
|
|
|
+SOURCES = $(libglib11_la_SOURCES) testglib.c
|
|
|
|
+OBJECTS = $(libglib11_la_OBJECTS) testglib.o
|
|
|
|
|
|
|
|
all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) glibconfig.h
|
|
|
|
|
|
|
|
@@ -273,8 +269,8 @@
|
|
|
|
|
|
|
|
maintainer-clean-libtool:
|
|
|
|
|
|
|
|
-libglib-1.1.la: $(libglib_1_1_la_OBJECTS) $(libglib_1_1_la_DEPENDENCIES)
|
|
|
|
- $(LINK) -rpath $(libdir) $(libglib_1_1_la_LDFLAGS) $(libglib_1_1_la_OBJECTS) $(libglib_1_1_la_LIBADD) $(LIBS)
|
|
|
|
+libglib11.la: $(libglib11_la_OBJECTS) $(libglib11_la_DEPENDENCIES)
|
|
|
|
+ $(LINK) -rpath $(libdir) $(libglib11_la_LDFLAGS) $(libglib11_la_OBJECTS) $(libglib11_la_LIBADD) $(LIBS)
|
|
|
|
|
|
|
|
mostlyclean-noinstPROGRAMS:
|
|
|
|
|
1998-08-06 14:55:13 +00:00
|
|
|
@@ -308,25 +304,6 @@
|
1998-07-28 15:22:17 +00:00
|
|
|
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
|
|
|
|
done
|
|
|
|
|
|
|
|
-install-configincludeDATA: $(configinclude_DATA)
|
|
|
|
- @$(NORMAL_INSTALL)
|
|
|
|
- $(mkinstalldirs) $(DESTDIR)$(configincludedir)
|
|
|
|
- @list='$(configinclude_DATA)'; for p in $$list; do \
|
|
|
|
- if test -f $(srcdir)/$$p; then \
|
|
|
|
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p"; \
|
|
|
|
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configincludedir)/$$p; \
|
|
|
|
- else if test -f $$p; then \
|
|
|
|
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p"; \
|
|
|
|
- $(INSTALL_DATA) $$p $(DESTDIR)$(configincludedir)/$$p; \
|
|
|
|
- fi; fi; \
|
|
|
|
- done
|
|
|
|
-
|
|
|
|
-uninstall-configincludeDATA:
|
|
|
|
- @$(NORMAL_UNINSTALL)
|
|
|
|
- list='$(configinclude_DATA)'; for p in $$list; do \
|
|
|
|
- rm -f $(DESTDIR)$(configincludedir)/$$p; \
|
|
|
|
- done
|
|
|
|
-
|
|
|
|
install-m4dataDATA: $(m4data_DATA)
|
|
|
|
@$(NORMAL_INSTALL)
|
|
|
|
$(mkinstalldirs) $(DESTDIR)$(m4datadir)
|
1998-08-06 14:55:13 +00:00
|
|
|
@@ -457,13 +434,13 @@
|
1998-07-28 15:22:17 +00:00
|
|
|
install-exec: install-libLTLIBRARIES install-binSCRIPTS
|
|
|
|
@$(NORMAL_INSTALL)
|
|
|
|
|
|
|
|
-install-data: install-configincludeDATA install-m4dataDATA install-includeHEADERS
|
|
|
|
+install-data: install-m4dataDATA install-includeHEADERS
|
|
|
|
@$(NORMAL_INSTALL)
|
|
|
|
|
|
|
|
install: install-exec install-data all
|
|
|
|
@:
|
|
|
|
|
|
|
|
-uninstall: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-configincludeDATA uninstall-m4dataDATA uninstall-includeHEADERS
|
|
|
|
+uninstall: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-m4dataDATA uninstall-includeHEADERS
|
|
|
|
|
|
|
|
install-strip:
|
|
|
|
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
|
1998-08-06 14:55:13 +00:00
|
|
|
@@ -519,7 +496,6 @@
|
1998-07-28 15:22:17 +00:00
|
|
|
maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
|
|
|
|
distclean-noinstPROGRAMS clean-noinstPROGRAMS \
|
|
|
|
maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
|
|
|
|
-uninstall-configincludeDATA install-configincludeDATA \
|
|
|
|
uninstall-m4dataDATA install-m4dataDATA uninstall-includeHEADERS \
|
|
|
|
install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
|
|
|
|
maintainer-clean-tags distdir info dvi installcheck install-exec \
|