[m-dev.] diff: use correct library extension
Peter Ross
petdr at cs.mu.OZ.AU
Thu Jun 8 23:04:19 AEST 2000
Hi,
===================================================================
Estimated hours taken: 2
Name library files with the default extension for the system used.
Mmake.common.in:
Record the default extension for library files.
Add the variable BOEHMGC_MAKEFILE only needed for building the
compiler.
scripts/Mmake.vars.in:
Delete BOEHMGC_MAKEFILE as it is only needed for building the
compiler.
configure.in:
Define the default for EXT_FOR_SHARED_LIB to be the extension
for libraries defined in Mmake.common.
boehm_gc/NT_MAKEFILE:
Use .lib instead of .a, seeing we only use this Makefile for
building the library on win32 systems.
Mmakefile:
boehm_gc/Mmakefile:
browser/Mmakefile:
compiler/Mmakefile:
library/Mmakefile:
runtime/Mmakefile:
trace/Mmakefile:
Use the variable defined in Mmake.common for the extension of
library files.
Index: Mmake.common.in
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmake.common.in,v
retrieving revision 1.44
diff -u -r1.44 Mmake.common.in
--- Mmake.common.in 1999/12/08 14:28:04 1.44
+++ Mmake.common.in 2000/06/08 10:58:57
@@ -178,6 +178,14 @@
#-----------------------------------------------------------------------------#
+# Extensions to use
+A=@LIB_SUFFIX@
+
+# Which makefile to use when compiling the garbage collector.
+BOEHMGC_MAKEFILE=@BOEHMGC_MAKEFILE@
+
+#-----------------------------------------------------------------------------#
+
# The Mmake.params file can be used to override definitions in this file
-include $(MERCURY_DIR)/Mmake.params
Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmakefile,v
retrieving revision 1.54
diff -u -r1.54 Mmakefile
--- Mmakefile 2000/05/29 02:46:51 1.54
+++ Mmakefile 2000/06/08 10:58:58
@@ -336,19 +336,19 @@
.PHONY: install_grades
install_grades: scripts
cd boehm_gc && rm -rf tmp_dir && mkdir tmp_dir && \
- { mv -f *.o *.pic_o *.a *.so tmp_dir || true; }
+ { mv -f *.o *.pic_o *.$A *.so tmp_dir || true; }
cd runtime && rm -rf tmp_dir && mkdir tmp_dir && \
- { mv -f *.o *.pic_o *.a *.so tmp_dir || true; }
+ { mv -f *.o *.pic_o *.$A *.so tmp_dir || true; }
cd library && rm -rf tmp_dir && mkdir tmp_dir && \
- { mv -f *.dep *.h *.c *.o *.pic_o *.a *.so \
+ { mv -f *.dep *.h *.c *.o *.pic_o *.$A *.so \
Mercury/deps/*.dep \
Mercury/cs/*.c Mercury/os/*.o tmp_dir || true; }
cd browser && rm -rf tmp_dir && mkdir tmp_dir && \
- { mv -f *.dep *.h *.c *.o *.pic_o *.a *.so \
+ { mv -f *.dep *.h *.c *.o *.pic_o *.$A *.so \
Mercury/deps/*.dep \
Mercury/cs/*.c Mercury/os/*.o tmp_dir || true; }
cd trace && rm -rf tmp_dir && mkdir tmp_dir && \
- { mv -f *.o *.pic_o *.a *.so tmp_dir || true; }
+ { mv -f *.o *.pic_o *.$A *.so tmp_dir || true; }
#
# Use the newly installed compiler to build the libraries
# in various different grades. We need to override MC=mmc
@@ -380,13 +380,13 @@
$(SUBDIR_MMAKE) MC=mmc GRADE=$$grade install_library ) && \
( cd trace && \
$(SUBDIR_MMAKE) MC=mmc GRADE=$$grade install_lib ) && \
- ( cd boehm_gc && rm -f *.o *.pic_o *.a *.so ) && \
- ( cd runtime && rm -f *.o *.pic_o *.a *.so ) && \
- ( cd library && rm -f *.dep *.h *.c *.o *.pic_o *.a *.so \
+ ( cd boehm_gc && rm -f *.o *.pic_o *.$A *.so ) && \
+ ( cd runtime && rm -f *.o *.pic_o *.$A *.so ) && \
+ ( cd library && rm -f *.dep *.h *.c *.o *.pic_o *.$A *.so \
Mercury/cs/*.c Mercury/os/*.o ) && \
- ( cd browser && rm -f *.dep *.h *.c *.o *.pic_o *.a *.so \
+ ( cd browser && rm -f *.dep *.h *.c *.o *.pic_o *.$A *.so \
Mercury/cs/*.c Mercury/os/*.o ) && \
- ( cd trace && rm -f *.o *.pic_o *.a *.so ) && \
+ ( cd trace && rm -f *.o *.pic_o *.$A *.so ) && \
true \
|| { scripts/mercury_cleanup_install; exit 1; }; \
fi; \
@@ -415,13 +415,13 @@
cd library && \
rm -rf tmp_dir && \
mkdir tmp_dir && \
- { mv -f *.dir *.dep *.h *.c *.o *.pic_o *.a *.so \
+ { mv -f *.dir *.dep *.h *.c *.o *.pic_o *.$A *.so \
Mercury/cs/*.c Mercury/os/*.o tmp_dir || true; } && \
for grade in $(GRADE) $(LIBGRADES); do \
$(SUBDIR_MMAKE) MC=mmc GRADE=$$grade depend && \
$(SUBDIR_MMAKE) MC=mmc GRADE=$$grade install_split_library || \
{ scripts/mercury_cleanup_install; exit 1; }; \
- rm -rf *.dir *.dep *.h *.c *.o *.pic_o *.a *.so \
+ rm -rf *.dir *.dep *.h *.c *.o *.pic_o *.$A *.so \
Mercury/cs/*.c Mercury/os/*.o; \
done && \
{ [ -d Mercury/cs ] && mv tmp_dir/*.c Mercury/cs; \
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.206
diff -u -r1.206 configure.in
--- configure.in 2000/06/08 07:58:46 1.206
+++ configure.in 2000/06/08 10:59:09
@@ -1930,7 +1930,7 @@
SHLIB_RPATH_SEP=" -Wl,-rpath,"
CFLAGS_FOR_PIC="-fpic -DPIC"
EXT_FOR_PIC_OBJECTS=pic_o
-EXT_FOR_SHARED_LIB=a
+EXT_FOR_SHARED_LIB=$LIB_SUFFIX
USE_DLLS=no
# The following variables specify options to $LINK_SHARED_OBJ to
# allow/disallow unresolved symbols when building shared libraries.
Index: boehm_gc/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/Mmakefile,v
retrieving revision 1.10
diff -u -r1.10 Mmakefile
--- boehm_gc/Mmakefile 2000/06/08 07:58:48 1.10
+++ boehm_gc/Mmakefile 2000/06/08 10:59:09
@@ -17,7 +17,7 @@
.PHONY: libgc$(PROF)
libgc$(PROF): submake
-libgc$(PROF).a: submake
+libgc$(PROF).$A: submake
libgc$(PROF).so: submake
@@ -32,7 +32,7 @@
submake: force
MAKEFLAGS=""; export MAKEFLAGS; \
$(MAKE) $(BOEHMGC_MAKEFILE) $(MMAKEFLAGS) GRADE=$(GRADE) PROF=$(PROF) \
- libgc$(PROF).a libgc$(PROF).$(EXT_FOR_SHARED_LIB) \
+ libgc$(PROF).$A libgc$(PROF).$(EXT_FOR_SHARED_LIB) \
$(EXT_FOR_SHARED_LIB)
.PHONY: force
@@ -41,7 +41,7 @@
clean_local:
MAKEFLAGS=""; export MAKEFLAGS; \
$(MAKE) $(BOEHMGC_MAKEFILE) $(MMAKEFLAGS) clean
- rm -f libgc.a libgc.so
+ rm -f libgc.$A libgc.so
#-----------------------------------------------------------------------------#
@@ -85,8 +85,8 @@
cp $(PRIVATE_HEADERS) $(INSTALL_INC_DIR)/private
.PHONY: install_lib
-install_lib: libgc$(PROF).a libgc$(PROF).$(EXT_FOR_SHARED_LIB) install_dirs
- cp `vpath_find libgc$(PROF).a libgc$(PROF).$(EXT_FOR_SHARED_LIB)` \
+install_lib: libgc$(PROF).$A libgc$(PROF).$(EXT_FOR_SHARED_LIB) install_dirs
+ cp `vpath_find libgc$(PROF).$A libgc$(PROF).$(EXT_FOR_SHARED_LIB)` \
$(INSTALL_MERC_GC_LIB_DIR) \
#-----------------------------------------------------------------------------#
Index: boehm_gc/NT_MAKEFILE
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/NT_MAKEFILE,v
retrieving revision 1.5
diff -u -r1.5 NT_MAKEFILE
--- boehm_gc/NT_MAKEFILE 2000/06/08 07:58:48 1.5
+++ boehm_gc/NT_MAKEFILE 2000/06/08 10:59:11
@@ -3,7 +3,6 @@
# This file may only be copied under the terms of the GNU General
# Public Licence - see the file COPYING in the Mercury distribution.
#-----------------------------------------------------------------------------#
-
# Makefile for Windows NT. Assumes Microsoft compiler, and a single thread.
# DLLs are included in the root set under NT, but not under win32S.
# Use "nmake nodebug=1 all" for optimized versions of library, gctest and editor.
@@ -50,11 +49,6 @@
# `ln -s' here doesn't work with gnu-win32, so we use `cp' instead
cp gc.lib libgc$(PROF)$(DLL_DEF_LIB).lib
-libgc$(PROF)$(DLL_DEF_LIB).a: gc.lib
- rm -f libgc$(PROF)$(DLL_DEF_LIB).a
- # `ln -s' here doesn't work with gnu-win32, so we use `cp' instead
- cp gc.lib libgc$(PROF)$(DLL_DEF_LIB).a
-
gctest.exe: test.obj libgc.lib
# The following works for win32 debugging. For win32s debugging use debugtype:coff
# and add mapsympe line.
@@ -96,8 +90,8 @@
# The Mmakefile invokes `make $(EXT_FOR_SHARED_LIB)',
# so we need targets `a', `so', and `dll'.
-.PHONY: a
-a: libgc$(PROF).a
+.PHONY: lib
+lib: libgc$(PROF).lib
.PHONY: so
so:
Index: browser/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/Mmakefile,v
retrieving revision 1.10
diff -u -r1.10 Mmakefile
--- browser/Mmakefile 2000/06/08 07:58:48 1.10
+++ browser/Mmakefile 2000/06/08 10:59:13
@@ -126,15 +126,15 @@
#-----------------------------------------------------------------------------#
.PHONY: library
-library: lib$(BROWSER_LIB_NAME).a lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB)
+library: lib$(BROWSER_LIB_NAME).$A lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB)
library: $(BROWSER_LIB_NAME).init
-lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a : $(mdb.os)
- rm -f lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a
+lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).$A : $(mdb.os)
+ rm -f lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).$A
$(AR) $(ALL_ARFLAGS) \
- $(AR_LIBFILE_OPT)lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a \
+ $(AR_LIBFILE_OPT)lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).$A \
$(mdb.os)
- $(RANLIB) lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).a
+ $(RANLIB) lib$(BROWSER_LIB_NAME)$(DLL_DEF_LIB).$A
RPATH_1=$(SHLIB_RPATH_OPT)$(FINAL_INSTALL_MERC_LIB_DIR)
RPATH_2=$(SHLIB_RPATH_SEP)$(FINAL_INSTALL_MERC_GC_LIB_DIR)
@@ -157,7 +157,7 @@
#-----------------------------------------------------------------------------#
realclean_local:
- rm -f lib$(BROWSER_LIB_NAME).a lib$(BROWSER_LIB_NAME).so \
+ rm -f lib$(BROWSER_LIB_NAME).$A lib$(BROWSER_LIB_NAME).so \
$(BROWSER_LIB_NAME).init mdb.init
rm -f tags
@@ -178,8 +178,8 @@
cp `vpath_find $(BROWSER_LIB_NAME).init` $(INSTALL_MODULE_DIR)
.PHONY: install_library
-install_library: lib$(BROWSER_LIB_NAME).a \
+install_library: lib$(BROWSER_LIB_NAME).$A \
lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB) install_dirs
- cp `vpath_find lib$(BROWSER_LIB_NAME).a \
+ cp `vpath_find lib$(BROWSER_LIB_NAME).$A \
lib$(BROWSER_LIB_NAME).$(EXT_FOR_SHARED_LIB)` \
$(INSTALL_MERC_LIB_DIR)
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.26
diff -u -r1.26 Mmakefile
--- compiler/Mmakefile 2000/05/15 06:10:03 1.26
+++ compiler/Mmakefile 2000/06/08 10:59:15
@@ -40,13 +40,13 @@
MERCURY_MKINIT=$(UTIL_DIR)/mkinit $(SCRIPTS_DIR)/c2init
ML = MERCURY_C_LIB_DIR=. $(SCRIPTS_DIR)/ml
MLFLAGS = --mercury-libs none
-MLLIBS = $(TRACE_DIR)/lib$(TRACE_LIB_NAME).a \
- $(BROWSER_DIR)/lib$(BROWSER_LIB_NAME).a \
- $(LIBRARY_DIR)/lib$(STD_LIB_NAME).a \
- $(RUNTIME_DIR)/lib$(RT_LIB_NAME).a ` \
+MLLIBS = $(TRACE_DIR)/lib$(TRACE_LIB_NAME).$A \
+ $(BROWSER_DIR)/lib$(BROWSER_LIB_NAME).$A \
+ $(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A \
+ $(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A ` \
case $(GRADE) in \
- *.gc*.prof*) echo $(BOEHM_GC_DIR)/libgc_prof.a ;; \
- *.gc*) echo $(BOEHM_GC_DIR)/libgc.a ;; \
+ *.gc*.prof*) echo $(BOEHM_GC_DIR)/libgc_prof.$A ;; \
+ *.gc*) echo $(BOEHM_GC_DIR)/libgc.$A ;; \
esac \
` -lm
MTAGS = $(SCRIPTS_DIR)/mtags
@@ -137,11 +137,11 @@
# Add some additional dependencies, so that Mmake knows to remake the
# compiler if one of the libraries changes.
-mercury_compile: $(RUNTIME_DIR)/lib$(RT_LIB_NAME).a
-mercury_compile: $(LIBRARY_DIR)/lib$(STD_LIB_NAME).a
-mercury_compile: $(BROWSER_DIR)/lib$(BROWSER_LIB_NAME).a
-mercury_compile: $(TRACE_DIR)/lib$(TRACE_LIB_NAME).a
-# Should also depend on $(BOEHM_GC_DIR)/libgc(_prof).a, but only
+mercury_compile: $(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
+mercury_compile: $(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
+mercury_compile: $(BROWSER_DIR)/lib$(BROWSER_LIB_NAME).$A
+mercury_compile: $(TRACE_DIR)/lib$(TRACE_LIB_NAME).$A
+# Should also depend on $(BOEHM_GC_DIR)/libgc(_prof).$A, but only
# if in .gc(.prof) grade; GNU make does not support dynamic dependencies,
# so just leave it out.
Index: library/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.50
diff -u -r1.50 Mmakefile
--- library/Mmakefile 2000/06/08 07:59:00 1.50
+++ library/Mmakefile 2000/06/08 10:59:35
@@ -190,15 +190,15 @@
# the following dependency is just there to improve compilation speed;
# making tree234.o first improves effective parallelism with parallel makes.
lib_std: $(os_subdir)tree234.o
-lib_std: lib$(STD_LIB_NAME).a lib$(STD_LIB_NAME).$(EXT_FOR_SHARED_LIB)
+lib_std: lib$(STD_LIB_NAME).$A lib$(STD_LIB_NAME).$(EXT_FOR_SHARED_LIB)
lib_std: $(STD_LIB_NAME).init
-lib$(STD_LIB_NAME)$(DLL_DEF_LIB).a : $(library.os)
- rm -f lib$(STD_LIB_NAME)$(DLL_DEF_LIB).a
+lib$(STD_LIB_NAME)$(DLL_DEF_LIB).$A : $(library.os)
+ rm -f lib$(STD_LIB_NAME)$(DLL_DEF_LIB).$A
$(AR) $(ALL_ARFLAGS) \
- $(AR_LIBFILE_OPT)lib$(STD_LIB_NAME)$(DLL_DEF_LIB).a \
+ $(AR_LIBFILE_OPT)lib$(STD_LIB_NAME)$(DLL_DEF_LIB).$A \
$(library.os)
- $(RANLIB) lib$(STD_LIB_NAME)$(DLL_DEF_LIB).a
+ $(RANLIB) lib$(STD_LIB_NAME)$(DLL_DEF_LIB).$A
RPATH_1=$(SHLIB_RPATH_OPT)$(FINAL_INSTALL_MERC_LIB_DIR)
RPATH_2=$(SHLIB_RPATH_SEP)$(FINAL_INSTALL_MERC_GC_LIB_DIR)
@@ -237,7 +237,7 @@
realclean_local:
rm -f $(library.mods:%=%.h)
- rm -f lib$(STD_LIB_NAME).a lib$(STD_LIB_NAME).so $(STD_LIB_NAME).init
+ rm -f lib$(STD_LIB_NAME).$A lib$(STD_LIB_NAME).so $(STD_LIB_NAME).init
rm -f tags
#-----------------------------------------------------------------------------#
@@ -283,18 +283,18 @@
$(INSTALL_MODULE_DIR)/libmercury.init
.PHONY: install_library
-install_library: lib$(STD_LIB_NAME).a \
+install_library: lib$(STD_LIB_NAME).$A \
lib$(STD_LIB_NAME).$(EXT_FOR_SHARED_LIB) install_grade_dirs
- cp `vpath_find lib$(STD_LIB_NAME).a \
+ cp `vpath_find lib$(STD_LIB_NAME).$A \
lib$(STD_LIB_NAME).$(EXT_FOR_SHARED_LIB)` \
$(INSTALL_MERC_LIB_DIR)
-# library.split.a is a version of lib$(STD_LIB_NAME).a that has been compiled
+# library.split.$A is a version of lib$(STD_LIB_NAME).$A that has been compiled
# with `--split-c-files'.
.PHONY: install_split_library
-install_split_library: library.split.a install_grade_dirs
- cp `vpath_find library.split.a` \
- $(INSTALL_MERC_LIB_DIR)/lib$(STD_LIB_NAME).a
+install_split_library: library.split.$A install_grade_dirs
+ cp `vpath_find library.split.$A` \
+ $(INSTALL_MERC_LIB_DIR)/lib$(STD_LIB_NAME).$A
else
Index: runtime/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/Mmakefile,v
retrieving revision 1.56
diff -u -r1.56 Mmakefile
--- runtime/Mmakefile 2000/06/08 07:59:03 1.56
+++ runtime/Mmakefile 2000/06/08 10:59:37
@@ -94,7 +94,7 @@
mercury_unify_compare_body.h
# Note that $(LIB_GLOBALS_H) cannot be part of $(HDRS), since it depends on
-# lib$(RT_LIB_NAME)$(DLL_DEF_LIB).a, and $(OBJ) : $(HDRS) would create a
+# lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A, and $(OBJ) : $(HDRS) would create a
# circular dependency.
MACHHDRS = machdeps/no_regs.h \
@@ -197,15 +197,15 @@
#-----------------------------------------------------------------------------#
.PHONY: runtime
-runtime: lib$(RT_LIB_NAME).a lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
+runtime: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)
runtime: $(RT_LIB_NAME).init
runtime: $(LIB_DLL_H) $(LIB_GLOBALS_H)
-lib$(RT_LIB_NAME)$(DLL_DEF_LIB).a: $(OBJS)
- rm -f lib$(RT_LIB_NAME)$(DLL_DEF_LIB).a
+lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A: $(OBJS)
+ rm -f lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A
$(AR) $(ALL_ARFLAGS) \
- $(AR_LIBFILE_OPT)lib$(RT_LIB_NAME)$(DLL_DEF_LIB).a $(OBJS)
- $(RANLIB) lib$(RT_LIB_NAME)$(DLL_DEF_LIB).a
+ $(AR_LIBFILE_OPT)lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A $(OBJS)
+ $(RANLIB) lib$(RT_LIB_NAME)$(DLL_DEF_LIB).$A
lib$(RT_LIB_NAME).so: $(PIC_OBJS)
$(LINK_SHARED_OBJ) -o lib$(RT_LIB_NAME).so $(PIC_OBJS) \
@@ -307,9 +307,9 @@
rm -f $(INSTALL_MODULE_DIR)/runtime.init
.PHONY: install_lib
-install_lib: lib$(RT_LIB_NAME).a lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
+install_lib: lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB) \
install_dirs
- cp `vpath_find lib$(RT_LIB_NAME).a \
+ cp `vpath_find lib$(RT_LIB_NAME).$A \
lib$(RT_LIB_NAME).$(EXT_FOR_SHARED_LIB)` \
$(INSTALL_MERC_LIB_DIR)
@@ -331,7 +331,7 @@
rm -f $(HDR_CHECK_OBJS) $(HDR_CHECK_CS) $(HDR_CHECK_MACROS)
realclean_local:
- rm -f lib$(RT_LIB_NAME).a lib$(RT_LIB_NAME).so $(RT_LIB_NAME).init
+ rm -f lib$(RT_LIB_NAME).$A lib$(RT_LIB_NAME).so $(RT_LIB_NAME).init
rm -f mercury_conf.h mercury_conf.h.date
#-----------------------------------------------------------------------------#
Index: scripts/Mmake.vars.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.vars.in,v
retrieving revision 1.32
diff -u -r1.32 Mmake.vars.in
--- scripts/Mmake.vars.in 2000/06/08 07:59:10 1.32
+++ scripts/Mmake.vars.in 2000/06/08 10:59:43
@@ -477,7 +477,6 @@
#-----------------------------------------------------------------------------#
OBJFILE_OPT=@OBJFILE_OPT@
-BOEHMGC_MAKEFILE=@BOEHMGC_MAKEFILE@
O=@OBJ_SUFFIX@
A=@LIB_SUFFIX@
Index: trace/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/Mmakefile,v
retrieving revision 1.14
diff -u -r1.14 Mmakefile
--- trace/Mmakefile 2000/06/08 07:59:12 1.14
+++ trace/Mmakefile 2000/06/08 10:59:47
@@ -119,14 +119,14 @@
#-----------------------------------------------------------------------------#
.PHONY: trace
-trace: lib$(TRACE_LIB_NAME).a lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)
+trace: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)
trace: $(LIB_DLL_H) $(LIB_GLOBALS_H)
-lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).a: $(OBJS)
- rm -f lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).a
+lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).$A: $(OBJS)
+ rm -f lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).$A
$(AR) $(ALL_ARFLAGS) \
- $(AR_LIBFILE_OPT)lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).a $(OBJS)
- $(RANLIB) lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).a
+ $(AR_LIBFILE_OPT)lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).$A $(OBJS)
+ $(RANLIB) lib$(TRACE_LIB_NAME)$(DLL_DEF_LIB).$A
lib$(TRACE_LIB_NAME).so: $(PIC_OBJS)
$(LINK_SHARED_OBJ) -o lib$(TRACE_LIB_NAME).so $(PIC_OBJS) \
@@ -161,9 +161,9 @@
cp `vpath_find $(HDRS) $(LIB_GLOBALS_H)` $(INSTALL_INC_DIR)
.PHONY: install_lib
-install_lib: lib$(TRACE_LIB_NAME).a lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)
+install_lib: lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)
-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
- cp `vpath_find lib$(TRACE_LIB_NAME).a \
+ cp `vpath_find lib$(TRACE_LIB_NAME).$A \
lib$(TRACE_LIB_NAME).$(EXT_FOR_SHARED_LIB)` \
$(INSTALL_MERC_LIB_DIR)
@@ -181,6 +181,6 @@
rm -f $(OBJS) $(PIC_OBJS)
realclean_local:
- rm -f lib$(TRACE_LIB_NAME).a lib$(TRACE_LIB_NAME).so
+ rm -f lib$(TRACE_LIB_NAME).$A lib$(TRACE_LIB_NAME).so
#-----------------------------------------------------------------------------#
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to: mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions: mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------
More information about the developers
mailing list