# HG changeset patch
# User jwe
# Date 821163495 0
# Node ID b3ce842b49758330cad585af241f192f4d802e07
# Parent  4afce032330e301df21008b03aec68b72ec40f16
[project @ 1996-01-09 04:53:25 by jwe]

diff --git a/kpathsea/Makefile.in b/kpathsea/Makefile.in
--- a/kpathsea/Makefile.in
+++ b/kpathsea/Makefile.in
@@ -33,16 +33,36 @@
 version.o xcalloc.o xfopen.o xmalloc.o xopendir.o xputenv.o xrealloc.o   \
 xstat.o xstrdup.o $(malloc)
 
-library = kpathsea
+LIBS_TO_INSTALL = libkpathsea.a libkpathsea.so
+
+default all: stamp-picdir kpsewhich MakeTeXPK kpathsea.info stamp-shared
 
-default all: kpsewhich MakeTeXPK $(library).info
+stamp-picdir:
+	if [ -n "$(CPICFLAG)" ]; then \
+	  if [ -d pic ]; then true; else mkdir pic ; fi ; \
+	else true; fi
+	touch stamp-picdir
 
-$(library).a: $(objects)
+libkpathsea.a: $(objects)
 	rm -f $@
 	$(AR) $(ARFLAGS) $@ $(objects)
 	$(RANLIB) $@
 
-kpsewhich: $(library).a kpsewhich.o
+ifeq ($(SHARED_LIBS), true)
+  ifdef CPICFLAG
+    PICOBJ := $(addprefix pic/, $(objects))
+  else
+    PICOBJ := $(objects)
+  endif
+endif
+
+stamp-shared: $(PICOBJ)
+	if $(SHARED_LIBS); then \
+	  $(CC) -shared -o libkpathsea.$(SHLEXT) $(PICOBJ); \
+	fi
+	touch stamp-shared
+
+kpsewhich: libkpathsea.a kpsewhich.o
 	$(link_command) kpsewhich.o $(LOADLIBES)
 
 MakeTeXPK: MakeTeXPK.in $(top_srcdir)/../make/paths.make
@@ -113,6 +133,10 @@
 check: 
 
 install:
+	for f in $(LIBS_TO_INSTALL); do \
+	  if [ -f $$f ]; then $(INSTALL_DATA) $$f $(libdir)/$$f; fi; \
+	done
+
 uninstall:
 
 # Installation of kpathsea itself is complicated by the fact that we
@@ -142,33 +166,33 @@
 #uninstall-data:
 #	rm -f $(infodir)/kpathsea.info*
 #
-#install-library: $(library).a 
+#install-library: libkpathsea.a 
 #	$(SHELL) $(top_srcdir)/../mkdirchain $(includedir)/kpathsea $(libdir)
-#	$(INSTALL_DATA) $(library).a $(libdir)/lib$(library).a
+#	$(INSTALL_DATA) libkpathsea.a $(libdir)/libkpathsea.a
 #	for f in $(install_headers); do \
 #	  $(INSTALL_DATA) $$f $(includedir)/kpathsea/$$f; done
 #	rm -f $(includedir)/kpathsea/c-auto.h
 #uninstall-library:
-#	rm -f $(libdir)/lib$(library).a
+#	rm -f $(libdir)/libkpathsea.a
 #	for f in $(install_headers); do rm -f $(includedir)/$$f; done
 
 # distdir is used by other distributions; they define $(distdir).
-distdir: INSTALL TAGS $(library).info $(library).dvi
+distdir: INSTALL TAGS kpathsea.info kpathsea.dvi
 	rm -rf $(distdir)
 	mkdir -p $(distdir)
 	ln $(ln_files) $(distdir)
 	cp -p $(HOME)/gnu/gnuorg/*.texi $(distdir)
 	touch *.info*
-	ln *.info* *.texi $(library).aux $(library).cps $(distdir)
+	ln *.info* *.texi kpathsea.aux kpathsea.cps $(distdir)
 	ln CONFIGURE HIER common.ac $(distdir)
 	cd $(distdir); rm -f paths.h
 	cd $(distdir); add-version $(version) version.c
 
 ac_include ../make/config.make
 
-info: $(library).info
-dvi: $(library).dvi
-INSTALL: $(library).texi install.texi
+info: kpathsea.info
+dvi: kpathsea.dvi
+INSTALL: kpathsea.texi install.texi
 	$(MAKEINFO) $(MAKEINFO_FLAGS) --no-headers $< -o - \
 	  | sed -n -e '/^Installation/,/wrong fonts/'p >$@
 	add-info-toc $@
diff --git a/libcruft/Makefile.in b/libcruft/Makefile.in
--- a/libcruft/Makefile.in
+++ b/libcruft/Makefile.in
@@ -100,6 +100,7 @@
 
 clean mostlyclean::
 	rm -f *.a *.o
+	if $(SHARED_LIBS); then rm -f *.$(SHLEXT); fi
 
 distclean:: clean
 	rm -f Makefile Makerules
diff --git a/liboctave/Makefile.in b/liboctave/Makefile.in
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -123,6 +123,7 @@
 
 clean:
 	rm -f *.a *.o *.d pic/*.o
+	if $(SHARED_LIBS); then rm -f *.$(SHLEXT); fi
 .PHONY: clean
 
 mostlyclean: clean
diff --git a/make/misc.make b/make/misc.make
--- a/make/misc.make
+++ b/make/misc.make
@@ -5,6 +5,7 @@
 
 mostlyclean::
 	rm -f *.o $(program) $(programs) squeeze $(library).a
+	if $(SHARED_LIBS); then rm -f *.$(SHLEXT); fi
 
 clean:: mostlyclean
 	rm -f *.dvi *.lj
diff --git a/readline/Makefile.in b/readline/Makefile.in
--- a/readline/Makefile.in
+++ b/readline/Makefile.in
@@ -201,6 +201,7 @@
 clean:
 	$(RM) -f $(OBJECTS) libreadline.a libhistory.a
 	(if [ -d doc ]; then cd doc; $(MAKE) $(MFLAGS) $@; fi)
+	if $(SHARED_LIBS); then rm -f *.$(SHLEXT); fi
 
 maintainer-clean realclean distclean mostlyclean: clean
 	(if [ -d doc ]; then cd doc; $(MAKE) $(MFLAGS) $@; fi)
diff --git a/src/Makefile.in b/src/Makefile.in
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -260,6 +260,7 @@
 clean:
 	rm -f *.a *.o builtins.cc safe-stat.h safe-lstat.h \
 	defaults.h *.d *.def
+	if $(SHARED_LIBS); then rm -f *.$(SHLEXT); fi
 .PHONY: clean
 
 mostlyclean: