--- Makefile.in.orig Thu Aug 6 01:16:42 1998 +++ Makefile.in Thu Aug 6 14:45:14 1998 @@ -77,8 +77,6 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ -configincludedir = $(pkglibdir)/include - bin_SCRIPTS=glib-config EXTRA_DIST = \ @@ -109,12 +107,10 @@ gutils.c include_HEADERS = \ - glib.h - -configinclude_DATA = \ + glib.h \ glibconfig.h -libglib_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libglib_1_1_la_LDFLAGS = -version-info 0:2:0 INCLUDES = -I$(top_srcdir) @@ -151,7 +147,7 @@ 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) @@ -308,25 +304,6 @@ 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) @@ -457,13 +434,13 @@ 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 @@ -519,7 +496,6 @@ 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 \