Code update for Window Maker version 0.50.0

Read changes in ChangeLog and NEWS
2025-12-29 01:42:32 +01:00 · 1999-01-06 15:22:33 +00:00
parent 16698efd45
commit 0261c32636
232 changed files with 20628 additions and 8087 deletions
--- a/wrlib/Makefile.in
+++ b/wrlib/Makefile.in
@@ -69,6 +69,9 @@ I18N = @I18N@
 I18N_MB = @I18N_MB@
 ICONEXT = @ICONEXT@
 INTLIBS = @INTLIBS@
+LD = @LD@
+LIBTOOL = @LIBTOOL@
+LITE = @LITE@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
@@ -92,7 +95,9 @@ wprefsdir = @wprefsdir@

 AUTOMAKE_OPTIONS = no-dependencies

-lib_LIBRARIES = libwraster.a
+lib_LTLIBRARIES = libwraster.la
+
+libwraster_la_LDFLAGS = -version-info 1:1:0

 noinst_PROGRAMS = test testgrad testdraw view 

@@ -100,7 +105,7 @@ EXTRA_DIST = test.png tile.xpm ballot_box.xpm ballot_box.tiff

 include_HEADERS = wraster.h

-libwraster_a_SOURCES = 	\
+libwraster_la_SOURCES = 	\
 	raster.c 	\
 	draw.c		\
 	color.c		\
@@ -124,7 +129,7 @@ libwraster_a_SOURCES = 	\

 INCLUDES = @DFLAGS@ @XCFLAGS@ @GFXFLAGS@ @XSHM@

-LIBLIST = -L. -lwraster @GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm
+LIBLIST = libwraster.la @GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm

 view_SOURCES= view.c

@@ -142,11 +147,11 @@ testdraw_SOURCES = testdraw.c

 testdraw_LDADD = $(LIBLIST)

-libwraster_a_LIBADD = @ALLOCA@
+libwraster_la_LIBADD = @ALLOCA@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../src/config.h
 CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(lib_LIBRARIES)
+LTLIBRARIES =  $(lib_LTLIBRARIES)


 DEFS = @DEFS@ -I. -I$(srcdir) -I../src
@@ -156,28 +161,29 @@ LIBS = @LIBS@
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-libwraster_a_DEPENDENCIES =  @ALLOCA@
-libwraster_a_OBJECTS =  raster.o draw.o color.o load.o save.o gradient.o \
-xpixmap.o convert.o context.o misc.o scale.o convolve.o nxpm.o xpm.o \
-xutil.o ppm.o png.o jpeg.o tiff.o gif.o
-AR = ar
+libwraster_la_DEPENDENCIES =  @ALLOCA@
+libwraster_la_OBJECTS =  raster.lo draw.lo color.lo load.lo save.lo \
+gradient.lo xpixmap.lo convert.lo context.lo misc.lo scale.lo \
+convolve.lo nxpm.lo xpm.lo xutil.lo ppm.lo png.lo jpeg.lo tiff.lo \
+gif.lo
 PROGRAMS =  $(noinst_PROGRAMS)

 test_OBJECTS =  test.o
-test_DEPENDENCIES = 
+test_DEPENDENCIES =  libwraster.la
 test_LDFLAGS = 
 testgrad_OBJECTS =  testgrad.o
-testgrad_DEPENDENCIES = 
+testgrad_DEPENDENCIES =  libwraster.la
 testgrad_LDFLAGS = 
 testdraw_OBJECTS =  testdraw.o
-testdraw_DEPENDENCIES = 
+testdraw_DEPENDENCIES =  libwraster.la
 testdraw_LDFLAGS = 
 view_OBJECTS =  view.o
-view_DEPENDENCIES = 
+view_DEPENDENCIES =  libwraster.la
 view_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 HEADERS =  $(include_HEADERS)

 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
@@ -188,13 +194,13 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

 TAR = tar
 GZIP = --best
-SOURCES = $(libwraster_a_SOURCES) $(test_SOURCES) $(testgrad_SOURCES) $(testdraw_SOURCES) $(view_SOURCES)
-OBJECTS = $(libwraster_a_OBJECTS) $(test_OBJECTS) $(testgrad_OBJECTS) $(testdraw_OBJECTS) $(view_OBJECTS)
+SOURCES = $(libwraster_la_SOURCES) $(test_SOURCES) $(testgrad_SOURCES) $(testdraw_SOURCES) $(view_SOURCES)
+OBJECTS = $(libwraster_la_OBJECTS) $(test_OBJECTS) $(testgrad_OBJECTS) $(testdraw_OBJECTS) $(view_OBJECTS)

-all: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)

 .SUFFIXES:
-.SUFFIXES: .S .c .o .s
+.SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && $(AUTOMAKE) --gnu wrlib/Makefile

@@ -203,36 +209,29 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status


-mostlyclean-libLIBRARIES:
+mostlyclean-libLTLIBRARIES:

-clean-libLIBRARIES:
-	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)

-distclean-libLIBRARIES:
+distclean-libLTLIBRARIES:

-maintainer-clean-libLIBRARIES:
+maintainer-clean-libLTLIBRARIES:

-install-libLIBRARIES: $(lib_LIBRARIES)
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	list='$(lib_LIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
-	  else :; fi; \
-	done
-	@$(POST_INSTALL)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
 	  else :; fi; \
 	done

-uninstall-libLIBRARIES:
+uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(libdir)/$$p; \
+	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 	done

 .c.o:
@@ -254,10 +253,27 @@ distclean-compile:

 maintainer-clean-compile:

-libwraster.a: $(libwraster_a_OBJECTS) $(libwraster_a_DEPENDENCIES)
-	-rm -f libwraster.a
-	$(AR) cru libwraster.a $(libwraster_a_OBJECTS) $(libwraster_a_LIBADD)
-	$(RANLIB) libwraster.a
+.c.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.s.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+.S.lo:
+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+
+maintainer-clean-libtool:
+
+libwraster.la: $(libwraster_la_OBJECTS) $(libwraster_la_DEPENDENCIES)
+	$(LINK) -rpath $(libdir) $(libwraster_la_LDFLAGS) $(libwraster_la_OBJECTS) $(libwraster_la_LIBADD) $(LIBS)

 mostlyclean-noinstPROGRAMS:

@@ -340,7 +356,7 @@ dvi:
 check: all
 	$(MAKE)
 installcheck:
-install-exec: install-libLIBRARIES
+install-exec: install-libLTLIBRARIES
 	@$(NORMAL_INSTALL)

 install-data: install-includeHEADERS
@@ -349,7 +365,7 @@ install-data: install-includeHEADERS
 install: install-exec install-data all
 	@:

-uninstall: uninstall-libLIBRARIES uninstall-includeHEADERS
+uninstall: uninstall-libLTLIBRARIES uninstall-includeHEADERS

 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
@@ -371,29 +387,33 @@ distclean-generic:
 maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-libLIBRARIES mostlyclean-compile \
-		mostlyclean-noinstPROGRAMS mostlyclean-tags \
-		mostlyclean-generic
+mostlyclean:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
+		mostlyclean-tags mostlyclean-generic

-clean:  clean-libLIBRARIES clean-compile clean-noinstPROGRAMS clean-tags \
-		clean-generic mostlyclean
+clean:  clean-libLTLIBRARIES clean-compile clean-libtool \
+		clean-noinstPROGRAMS clean-tags clean-generic \
+		mostlyclean

-distclean:  distclean-libLIBRARIES distclean-compile \
+distclean:  distclean-libLTLIBRARIES distclean-compile distclean-libtool \
 		distclean-noinstPROGRAMS distclean-tags \
 		distclean-generic clean
 	-rm -f config.status
+	-rm -f libtool

-maintainer-clean:  maintainer-clean-libLIBRARIES \
-		maintainer-clean-compile \
+maintainer-clean:  maintainer-clean-libLTLIBRARIES \
+		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
 		maintainer-clean-generic distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."

-.PHONY: mostlyclean-libLIBRARIES distclean-libLIBRARIES \
-clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
-install-libLIBRARIES mostlyclean-compile distclean-compile \
-clean-compile maintainer-clean-compile mostlyclean-noinstPROGRAMS \
+.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+distclean-compile clean-compile maintainer-clean-compile \
+mostlyclean-libtool distclean-libtool clean-libtool \
+maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
 distclean-noinstPROGRAMS clean-noinstPROGRAMS \
 maintainer-clean-noinstPROGRAMS uninstall-includeHEADERS \
 install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \