diff liboctave/Makefile.in @ 3034:ad0e94b6784c

[project @ 1997-06-05 21:25:53 by jwe]
author jwe
date Thu, 05 Jun 1997 21:29:47 +0000
parents 9ce32027e269
children b8c5ded2751f
line wrap: on
line diff
--- a/liboctave/Makefile.in	Thu Jun 05 16:50:06 1997 +0000
+++ b/liboctave/Makefile.in	Thu Jun 05 21:29:47 1997 +0000
@@ -117,7 +117,7 @@
 
 LIBOCTAVE_DEPEND := $(patsubst %, liboctave.$(LIBEXT)(%), $(OBJECTS))
 
-all: libraries
+all: stamp-prereq libraries
 .PHONY: all
 
 stamp-prereq: pic safe-stat.h safe-lstat.h
@@ -132,13 +132,21 @@
 	fi
 
 ifeq ($(SHARED_LIBS), true)
-libraries: liboctave.$(LIBEXT) liboctave.$(SHLEXT)
+  ifeq ($(STATIC_LIBS), true)
+    libraries: liboctave.$(LIBEXT) liboctave.$(SHLEXT)
+  else
+    libraries: liboctave.$(SHLEXT)
+  endif
 else
-libraries: liboctave.$(LIBEXT)
+  ifeq ($(STATIC_LIBS), true)
+    libraries: liboctave.$(LIBEXT)
+  else
+    libraries:
+  endif
 endif
 .PHONY: libraries
 
-liboctave.$(LIBEXT): stamp-prereq $(OBJECTS)
+liboctave.$(LIBEXT): $(OBJECTS)
 	$(AR) $(ARFLAGS) liboctave.$(LIBEXT) $(OBJECTS)
 	$(RANLIB) liboctave.$(LIBEXT)
 
@@ -147,7 +155,7 @@
 	$(LN_S) liboctave.$(SHLEXT_VER) liboctave.$(SHLEXT)
 
 liboctave.$(SHLEXT_VER): stamp-prereq $(PICOBJ)
-	$(SH_LD) $(SH_LDFLAGS) -o liboctave.$(SHLEXT_VER) $(PICOBJ)
+	$(SH_LD) $(SH_LDFLAGS) -o $@ $(PICOBJ)
 
 extract_stat = sed 's/@l@//g; s/@L@//g; /@LSTAT_ONLY@/d'
 extract_lstat = sed 's/@l@/l/g; s/@L@/L/g; s/	*@LSTAT_ONLY@//'
@@ -187,9 +195,11 @@
 
 install-lib:
 	$(top_srcdir)/mkinstalldirs $(libdir)
-	rm -f $(libdir)/liboctave.$(LIBEXT)
-	$(INSTALL_DATA) liboctave.$(LIBEXT) $(libdir)/liboctave.$(LIBEXT)
-	$(RANLIB) $(libdir)/liboctave.$(LIBEXT)
+	if $(STATIC_LIBS); then \
+	  rm -f $(libdir)/liboctave.$(LIBEXT); \
+	  $(INSTALL_DATA) liboctave.$(LIBEXT) $(libdir)/liboctave.$(LIBEXT); \
+	  $(RANLIB) $(libdir)/liboctave.$(LIBEXT); \
+	fi
 	if $(SHARED_LIBS); then \
 	  rm -f $(libdir)/liboctave.$(SHLEXT_VER); \
 	  $(INSTALL_PROGRAM) \