Improved VMS support.

3 files changed, 46 insertions, 32 deletions

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 9696246..9b325ba 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,5 +1,13 @@
 2003-04-12  Bruno Haible  <bruno@clisp.org>
 
+	* Makefile.am (config.h_vms): Renamed from config.h.vms.
+	* Makefile.vms: New variables ABIFLAGS, DEFS. Avoid rules with no
+	lines. Update library creation rule. Don't use the force target.
+	Correct wildcard syntax.
+	Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>.
+
+2003-04-12  Bruno Haible  <bruno@clisp.org>
+
 	* Makefile.am (docdir): Use datadir instead of prefix.
 	* Makefile.msvc (datadir): New variable.
 	(sub_docdir): Use it instead of prefix.
diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index cc0a279..f8d9119 100644
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -181,12 +181,11 @@ EXTRA_DIST += texi2html autosprintf.html
 
 # VMS support.
 
-config.h.vms: config.h.in
-	(sed -e 's/#undef HAVE_ALLOCA$$/#define HAVE_ALLOCA 1/' \
+config.h_vms: config.h.in
+	(echo '#include <vms_jackets.h>'; \
+	 sed -e 's/#undef HAVE_ALLOCA$$/#define HAVE_ALLOCA 1/' \
 	     -e 's/#undef HAVE_DLFCN_H$$/#define HAVE_DLFCN_H 1/' \
-	     -e 's/#undef HAVE_INTMAX_T$$/#define HAVE_INTMAX_T 1/' \
 	     -e 's/#undef HAVE_INTTYPES_H$$/#define HAVE_INTTYPES_H 1/' \
-	     -e 's/#undef HAVE_INTTYPES_H_WITH_UINTMAX$$/#define HAVE_INTTYPES_H_WITH_UINTMAX 1/' \
 	     -e 's/#undef HAVE_LONG_DOUBLE$$/#define HAVE_LONG_DOUBLE 1/' \
 	     -e 's/#undef HAVE_LONG_LONG$$/#define HAVE_LONG_LONG 1/' \
 	     -e 's/#undef HAVE_MEMORY_H$$/#define HAVE_MEMORY_H 1/' \
@@ -200,9 +199,9 @@ config.h.vms: config.h.in
 	     -e 's/#undef HAVE_WCHAR_T$$/#define HAVE_WCHAR_T 1/' \
 	     -e 's/#undef HAVE_WINT_T$$/#define HAVE_WINT_T 1/' \
 	     -e 's/#undef STDC_HEADERS$$/#define STDC_HEADERS 1/' \
-	   < $<; echo; echo '#define alloca __ALLOCA'; echo '#include <vms_jackets.h>') > $@
+	   < $<; echo; echo '#define alloca __ALLOCA') > $@
 
-EXTRA_DIST += Makefile.vms config.h.vms
+EXTRA_DIST += Makefile.vms config.h_vms
 
 
 # Woe32 support.
diff --git a/gettext-runtime/libasprintf/Makefile.vms b/gettext-runtime/libasprintf/Makefile.vms
index 99110c9..9c14317 100644
--- a/gettext-runtime/libasprintf/Makefile.vms
+++ b/gettext-runtime/libasprintf/Makefile.vms
@@ -17,12 +17,17 @@ sub_docdir = $(datadir).doc.libasprintf
 CC = cc
 CXX = cxx
 
+# These flags affect binary compatibility. GNU gettext does not need them,
+# but other packages do, and we need to be binary compatible with them.
+ABIFLAGS = /name=(as_is,short) /float=ieee
+
 WARN_CFLAGS = /warning
 
 OPTIMFLAGS = /optimize
 
-CFLAGS = $(WARN_CFLAGS) $(OPTIMFLAGS) /define=("VMS=1","HAVE_CONFIG_H=1")
-CXXFLAGS = $(WARN_CFLAGS) $(OPTIMFLAGS) /define=("VMS=1","HAVE_CONFIG_H=1")
+CFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS)
+CXXFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS)
+DEFS = "VMS=1","HAVE_CONFIG_H=1"
 
 INCLUDES = /include=([])
 
@@ -42,65 +47,67 @@ INSTALL_DATA = copy
 OBJECTS = lib-asprintf.obj,autosprintf.obj
 
 all : autosprintf.h,asprintf.olb
+	write sys$output "Nothing else to be done for 'all'."
 
 autosprintf.h :
-	$(LN) autosprintf.h.in autosprintf.h
+	$(LN) autosprintf.h_in autosprintf.h
 
-config.h : config.h.vms
-	$(RM) config.h
-	$(LN) config.h.vms config.h
+config.h : config.h_vms
+	$(LN) config.h_vms config.h
 
 alloca.h : alloca_.h
-	$(RM) alloca.h
 	$(LN) alloca_.h alloca.h
 
 lib-asprintf.obj : lib-asprintf.c,config.h,printf-args.h,printf-args.c,printf-parse.h,printf-parse.c,alloca.h,vasnprintf.h,vasnprintf.c,asnprintf.c,vasprintf.h,vasprintf.c,asprintf.c
-	$(CC) $(INCLUDES) $(CFLAGS) lib-asprintf.c
+	$(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) lib-asprintf.c
 
 autosprintf.obj : autosprintf.cc,autosprintf.h,config.h,lib-asprintf.h
-	$(CXX) $(INCLUDES) $(CXXFLAGS) autosprintf.cc
+	$(CXX) $(INCLUDES) $(CXXFLAGS) /define=($(DEFS)) autosprintf.cc
 
 asprintf.olb : $(OBJECTS)
-	$(RM) asprintf.olb
 	$(AR) $(AR_FLAGS) asprintf.olb $(OBJECTS)
 
-install : all,force
+install : all
 	create /directory $(prefix)]
 	create /directory $(includedir)]
 	$(INSTALL_DATA) autosprintf.h $(includedir)]autosprintf.h
 	create /directory $(exec_prefix)]
 	create /directory $(libdir)]
 	$(INSTALL_DATA) asprintf.olb $(libdir)]asprintf.olb
-	create /directory $(prefix).doc]
+	create /directory $(datadir)]
+	create /directory $(datadir).doc]
 	create /directory $(sub_docdir)]
 	$(INSTALL_DATA) [.doc]autosprintf.html $(sub_docdir)]autosprintf.html
 
-installdirs : force
+installdirs :
 	create /directory $(prefix)]
 	create /directory $(includedir)]
 	create /directory $(exec_prefix)]
 	create /directory $(libdir)]
-	create /directory $(prefix).doc]
+	create /directory $(datadir)]
+	create /directory $(datadir).doc]
 	create /directory $(sub_docdir)]
 
-uninstall : force
-	$(RM) $(includedir)]autosprintf.h
-	$(RM) $(libdir)]asprintf.olb
-	$(RM) $(sub_docdir)]autosprintf.html
+uninstall :
+	$(RM) $(includedir)]autosprintf.h;
+	$(RM) $(libdir)]asprintf.olb;
+	$(RM) $(sub_docdir)]autosprintf.html;
 
 check : all
+	write sys$output "Nothing else to be done for 'check'."
 
 mostlyclean : clean
+	write sys$output "Nothing else to be done for 'mostlyclean'."
 
-clean : force
-	$(RM) autosprintf.h
-	$(RM) config.h
-	$(RM) alloca.h
-	$(RM) *.obj
-	$(RM) *.olb
+clean :
+	$(RM) autosprintf.h;*
+	$(RM) config.h;*
+	$(RM) alloca.h;*
+	$(RM) *.obj;*
+	$(RM) *.olb;*
 
 distclean : clean
+	write sys$output "Nothing else to be done for 'distclean'."
 
 maintainer-clean : distclean
-
-force :
+	write sys$output "Nothing else to be done for 'maintainer-clean'."