diff options
37 files changed, 661 insertions, 456 deletions
@@ -1,5 +1,10 @@ 2003-04-12 Bruno Haible <bruno@clisp.org> + * Makefile.vms: Don't use the force target. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + +2003-04-12 Bruno Haible <bruno@clisp.org> + * Makefile.msvc (mandir, docdir): Use datadir instead of prefix. 2003-04-06 Bruno Haible <bruno@clisp.org> diff --git a/Makefile.vms b/Makefile.vms index da8d765..1b647ee 100644 --- a/Makefile.vms +++ b/Makefile.vms @@ -5,7 +5,7 @@ #### End of system configuration section. #### -all : force +all : set default [.gettext-runtime] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all set default [-] @@ -13,7 +13,7 @@ all : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all set default [-] -install : force +install : set default [.gettext-runtime] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install set default [-] @@ -21,7 +21,7 @@ install : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install set default [-] -installdirs : force +installdirs : set default [.gettext-runtime] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs set default [-] @@ -29,7 +29,7 @@ installdirs : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs set default [-] -uninstall : force +uninstall : set default [.gettext-runtime] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall set default [-] @@ -37,7 +37,7 @@ uninstall : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall set default [-] -check : all,force +check : all set default [.gettext-runtime] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check set default [-] @@ -45,7 +45,7 @@ check : all,force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check set default [-] -mostlyclean : force +mostlyclean : set default [.gettext-runtime] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean set default [-] @@ -53,7 +53,7 @@ mostlyclean : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean set default [-] -clean : force +clean : set default [.gettext-runtime] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean set default [-] @@ -61,7 +61,7 @@ clean : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean set default [-] -distclean : force +distclean : set default [.gettext-runtime] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean set default [-] @@ -69,12 +69,10 @@ distclean : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean set default [-] -maintainer-clean : force +maintainer-clean : set default [.gettext-runtime] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean set default [-] set default [.gettext-tools] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean set default [-] - -force : diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog index ffdb21a..783b811 100644 --- a/gettext-runtime/ChangeLog +++ b/gettext-runtime/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: Don't use the force target. Don't recurse into + libasprintf. Use config.h_vms, not config.h.vms. Correct wildcard + syntax. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + +2003-04-12 Bruno Haible <bruno@clisp.org> + * configure.ac (mandir): Change default value. * Makefile.msvc (mandir, docdir): Use datadir instead of prefix. diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am index 328398b..ccbbd44 100644 --- a/gettext-runtime/Makefile.am +++ b/gettext-runtime/Makefile.am @@ -50,8 +50,9 @@ ABOUT-NLS: $(srcdir)/doc/nls.texi $(srcdir)/doc/matrix.texi # VMS support. -config.h.vms: config.h.in ../version.sh - (sed -e 's/#undef ENABLE_NLS$$/#define ENABLE_NLS 1/' \ +config.h_vms: config.h.in ../version.sh + (echo '#define KEEP_CRTL_SETLOCALE 1'; echo '#include <vms_jackets.h>'; echo '#undef realpath'; \ + sed -e 's/#undef ENABLE_NLS$$/#define ENABLE_NLS 1/' \ -e 's/#undef HAVE_ALLOCA$$/#define HAVE_ALLOCA 1/' \ -e 's/#undef HAVE_DLFCN_H$$/#define HAVE_DLFCN_H 1/' \ -e 's/#undef HAVE_ENVIRON_DECL$$/#define HAVE_ENVIRON_DECL 1/' \ @@ -64,9 +65,10 @@ config.h.vms: config.h.in ../version.sh -e 's/#undef HAVE_GETUID$$/#define HAVE_GETUID 1/' \ -e 's/#undef HAVE_ICONV$$/#define HAVE_ICONV 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_LANGINFO_CODESET$$/#define HAVE_LANGINFO_CODESET 1/' \ -e 's/#undef HAVE_LC_MESSAGES$$/#define HAVE_LC_MESSAGES 1/' \ + -e 's/#undef HAVE_LIMITS_H$$/#define HAVE_LIMITS_H 1/' \ + -e 's/#undef HAVE_LOCALE_H$$/#define HAVE_LOCALE_H 1/' \ -e 's/#undef HAVE_MALLOC_H$$/#define HAVE_MALLOC_H 1/' \ -e 's/#undef HAVE_MEMMOVE$$/#define HAVE_MEMMOVE 1/' \ -e 's/#undef HAVE_MEMORY_H$$/#define HAVE_MEMORY_H 1/' \ @@ -88,20 +90,21 @@ config.h.vms: config.h.in ../version.sh -e 's/#undef HAVE_SYS_PARAM_H$$/#define HAVE_SYS_PARAM_H 1/' \ -e 's/#undef HAVE_SYS_STAT_H$$/#define HAVE_SYS_STAT_H 1/' \ -e 's/#undef HAVE_SYS_TYPES_H$$/#define HAVE_SYS_TYPES_H 1/' \ - -e 's/#undef HAVE_UINTMAX_T$$/#define HAVE_UINTMAX_T 1/' \ -e 's/#undef HAVE_UNISTD_H$$/#define HAVE_UNISTD_H 1/' \ -e 's/#undef HAVE_UNSETENV$$/#define HAVE_UNSETENV 1/' \ -e 's/#undef HAVE_UNSIGNED_LONG_LONG$$/#define HAVE_UNSIGNED_LONG_LONG 1/' \ -e 's/#undef HAVE_VPRINTF$$/#define HAVE_VPRINTF 1/' \ + -e 's/#undef ICONV_CONST$$/#define ICONV_CONST/' \ -e 's/#undef STDC_HEADERS$$/#define STDC_HEADERS 1/' \ -e 's/#undef realpath$$/#define realpath rpl_realpath/' \ + -e 's/#undef uintmax_t$$/#define uintmax_t unsigned long long/' \ -e 's/#undef PACKAGE$$/#define PACKAGE "gettext-runtime"/' \ -e 's/#undef VERSION$$/#define VERSION "$(VERSION)"/' \ - < $<; echo; echo '#define alloca __ALLOCA'; echo '#define KEEP_CRTL_SETLOCALE 1'; echo '#include <vms_jackets.h>') > $@ + < $<; echo; echo '#define alloca __ALLOCA') > $@ # vms_jackets.h is a header that comes with Compaq's "porting library". # KEEP_CRTL_SETLOCALE tells it to not override the native locale support. -EXTRA_DIST += Makefile.vms config.h.vms +EXTRA_DIST += Makefile.vms config.h_vms # Woe32 support. diff --git a/gettext-runtime/Makefile.vms b/gettext-runtime/Makefile.vms index 3373941..1db8b70 100644 --- a/gettext-runtime/Makefile.vms +++ b/gettext-runtime/Makefile.vms @@ -9,7 +9,10 @@ RM = -del #### End of system configuration section. #### -all : config.h,force +# The libasprintf directory is currently commented out here because the C++ +# compiler does not support the use of std::ostream after #include <iostream>. + +all : config.h set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all set default [-] @@ -19,9 +22,9 @@ all : config.h,force set default [.lib] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all set default [-] - set default [.libasprintf] - $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all - set default [-] +# set default [.libasprintf] +# $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all +# set default [-] set default [.src] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all set default [-] @@ -32,11 +35,10 @@ all : config.h,force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all set default [-] -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 -install : force +install : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install set default [-] @@ -46,9 +48,9 @@ install : force set default [.lib] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install set default [-] - set default [.libasprintf] - $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install - set default [-] +# set default [.libasprintf] +# $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install +# set default [-] set default [.src] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install set default [-] @@ -59,7 +61,7 @@ install : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install set default [-] -installdirs : force +installdirs : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs set default [-] @@ -69,9 +71,9 @@ installdirs : force set default [.lib] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs set default [-] - set default [.libasprintf] - $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs - set default [-] +# set default [.libasprintf] +# $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs +# set default [-] set default [.src] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs set default [-] @@ -82,7 +84,7 @@ installdirs : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs set default [-] -uninstall : force +uninstall : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall set default [-] @@ -92,9 +94,9 @@ uninstall : force set default [.lib] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall set default [-] - set default [.libasprintf] - $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall - set default [-] +# set default [.libasprintf] +# $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall +# set default [-] set default [.src] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall set default [-] @@ -105,7 +107,7 @@ uninstall : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall set default [-] -check : all,force +check : all set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check set default [-] @@ -115,9 +117,9 @@ check : all,force set default [.lib] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check set default [-] - set default [.libasprintf] - $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check - set default [-] +# set default [.libasprintf] +# $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check +# set default [-] set default [.src] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check set default [-] @@ -128,7 +130,7 @@ check : all,force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check set default [-] -mostlyclean : force +mostlyclean : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean set default [-] @@ -138,9 +140,9 @@ mostlyclean : force set default [.lib] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean set default [-] - set default [.libasprintf] - $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean - set default [-] +# set default [.libasprintf] +# $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean +# set default [-] set default [.src] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean set default [-] @@ -150,9 +152,9 @@ mostlyclean : force set default [.man] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean set default [-] - $(RM) config.h + $(RM) config.h;* -clean : force +clean : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean set default [-] @@ -162,9 +164,9 @@ clean : force set default [.lib] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean set default [-] - set default [.libasprintf] - $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean - set default [-] +# set default [.libasprintf] +# $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean +# set default [-] set default [.src] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean set default [-] @@ -174,9 +176,9 @@ clean : force set default [.man] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean set default [-] - $(RM) config.h + $(RM) config.h;* -distclean : force +distclean : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean set default [-] @@ -186,9 +188,9 @@ distclean : force set default [.lib] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean set default [-] - set default [.libasprintf] - $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean - set default [-] +# set default [.libasprintf] +# $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean +# set default [-] set default [.src] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean set default [-] @@ -198,9 +200,9 @@ distclean : force set default [.man] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean set default [-] - $(RM) config.h + $(RM) config.h;* -maintainer-clean : force +maintainer-clean : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean set default [-] @@ -210,9 +212,9 @@ maintainer-clean : force set default [.lib] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean set default [-] - set default [.libasprintf] - $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean - set default [-] +# set default [.libasprintf] +# $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean +# set default [-] set default [.src] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean set default [-] @@ -222,6 +224,4 @@ maintainer-clean : force set default [.man] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean set default [-] - $(RM) config.h - -force : + $(RM) config.h;* diff --git a/gettext-runtime/doc/ChangeLog b/gettext-runtime/doc/ChangeLog index b3b54b8..41af2a4 100644 --- a/gettext-runtime/doc/ChangeLog +++ b/gettext-runtime/doc/ChangeLog @@ -1,3 +1,8 @@ +2003-04-12 Bruno Haible <bruno@clisp.org> + + * Makefile.vms: Don't use the force target. Avoid rules with no lines. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + 2003-03-30 Bruno Haible <bruno@clisp.org> * Makefile.vms: New file. diff --git a/gettext-runtime/doc/Makefile.vms b/gettext-runtime/doc/Makefile.vms index 986fb3e..c517ba7 100644 --- a/gettext-runtime/doc/Makefile.vms +++ b/gettext-runtime/doc/Makefile.vms @@ -1,21 +1,28 @@ # -*- Makefile -*- for gettext-runtime/doc on VMS using the MMS utility all : + write sys$output "Nothing to be done for 'all'." install : all + write sys$output "Nothing else to be done for 'install'." installdirs : + write sys$output "Nothing to be done for 'installdirs'." uninstall : + write sys$output "Nothing to be done for 'uninstall'." check : + write sys$output "Nothing to be done for 'check'." mostlyclean : clean + write sys$output "Nothing else to be done for 'mostlyclean'." -clean : force +clean : + write sys$output "Nothing to be done for 'clean'." 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'." diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 990cfd2..db42056 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,5 +1,12 @@ 2003-04-12 Bruno Haible <bruno@clisp.org> + * 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> + * localcharset.c (get_charset_aliases): Add special case for VMS. 2003-04-06 Bruno Haible <bruno@clisp.org> diff --git a/gettext-runtime/intl/Makefile.vms b/gettext-runtime/intl/Makefile.vms index 86512b2..4650deb 100644 --- a/gettext-runtime/intl/Makefile.vms +++ b/gettext-runtime/intl/Makefile.vms @@ -19,11 +19,16 @@ aliaspath = $(localedir)] CC = cc +# 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","LOCALEDIR=""$(localedir)]""","LOCALE_ALIAS_PATH=""$(aliaspath)""","LIBDIR=""$(libdir)]""","IN_LIBINTL=1") +CFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) +DEFS = "VMS=1","HAVE_CONFIG_H=1","LOCALEDIR=""$(localedir)]""","LOCALE_ALIAS_PATH=""$(aliaspath)""","LIBDIR=""$(libdir)]""","IN_LIBINTL=1" INCLUDES = /include=([],[-]) @@ -43,84 +48,84 @@ INSTALL_DATA = copy OBJECTS = bindtextdom.obj,dcgettext.obj,dgettext.obj,gettext.obj,finddomain.obj,loadmsgcat.obj,localealias.obj,textdomain.obj,l10nflist.obj,explodename.obj,dcigettext.obj,dcngettext.obj,dngettext.obj,ngettext.obj,plural-parse.obj,plural-exp.obj,localcharset.obj,relocatable.obj,localename.obj,log.obj,osdep.obj,intl-compat.obj all : intl.olb,libintl.h + write sys$output "Nothing else to be done for 'all'." libgnuintl.h : - $(LN) $(srcdir)libgnuintl.h.in libgnuintl.h + $(LN) $(srcdir)libgnuintl.h_in libgnuintl.h bindtextdom.obj : $(srcdir)bindtextdom.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)bindtextdom.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)bindtextdom.c dcgettext.obj : $(srcdir)dcgettext.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)dcgettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)dcgettext.c dgettext.obj : $(srcdir)dgettext.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)dgettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)dgettext.c gettext.obj : $(srcdir)gettext.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)gettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)gettext.c finddomain.obj : $(srcdir)finddomain.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)finddomain.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)finddomain.c loadmsgcat.obj : $(srcdir)loadmsgcat.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h,$(srcdir)hash-string.h,$(srcdir)plural-exp.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)loadmsgcat.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)loadmsgcat.c localealias.obj : $(srcdir)localealias.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h,$(srcdir)relocatable.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)localealias.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)localealias.c textdomain.obj : $(srcdir)textdomain.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)textdomain.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)textdomain.c l10nflist.obj : $(srcdir)l10nflist.c,libgnuintl.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)l10nflist.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)l10nflist.c explodename.obj : $(srcdir)explodename.c,libgnuintl.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)explodename.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)explodename.c dcigettext.obj : $(srcdir)dcigettext.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h,$(srcdir)hash-string.h,$(srcdir)plural-exp.h,$(srcdir)eval-plural.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)dcigettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)dcigettext.c dcngettext.obj : $(srcdir)dcngettext.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)dcngettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)dcngettext.c dngettext.obj : $(srcdir)dngettext.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)dngettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)dngettext.c ngettext.obj : $(srcdir)ngettext.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)ngettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)ngettext.c plural-parse.obj : $(srcdir)plural.c,libgnuintl.h,$(srcdir)plural-exp.h - $(CC) $(INCLUDES) $(CFLAGS) /obj=plural-parse.obj $(srcdir)plural.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) /obj=plural-parse.obj $(srcdir)plural.c plural-exp.obj : $(srcdir)plural-exp.c,libgnuintl.h,$(srcdir)plural-exp.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)plural-exp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)plural-exp.c localcharset.obj : $(srcdir)localcharset.c,libgnuintl.h,$(srcdir)localcharset.h,$(srcdir)relocatable.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)localcharset.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)localcharset.c relocatable.obj : $(srcdir)relocatable.c,libgnuintl.h,$(srcdir)relocatable.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)relocatable.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)relocatable.c localename.obj : $(srcdir)localename.c,libgnuintl.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)localename.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)localename.c log.obj : $(srcdir)log.c,libgnuintl.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)log.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)log.c osdep.obj : $(srcdir)osdep.c,libgnuintl.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)osdep.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)osdep.c intl-compat.obj : $(srcdir)intl-compat.c,libgnuintl.h,$(srcdir)gettextP.h,$(srcdir)gmo.h,$(srcdir)loadinfo.h - $(CC) $(INCLUDES) $(CFLAGS) $(srcdir)intl-compat.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) $(srcdir)intl-compat.c intl.olb : $(OBJECTS) - $(RM) intl.olb $(AR) $(AR_FLAGS) intl.olb $(OBJECTS) libintl.h : libgnuintl.h $(LN) libgnuintl.h libintl.h -install : all,force +install : all create /directory $(prefix)] create /directory $(includedir)] $(INSTALL_DATA) libintl.h $(includedir)]libintl.h @@ -128,29 +133,30 @@ install : all,force create /directory $(libdir)] $(INSTALL_DATA) intl.lib $(libdir)]intl.lib -installdirs : force +installdirs : create /directory $(prefix)] create /directory $(includedir)] create /directory $(exec_prefix)] create /directory $(libdir)] -uninstall : force - $(RM) $(includedir)]libintl.h - $(RM) $(libdir)]intl.lib +uninstall : + $(RM) $(includedir)]libintl.h; + $(RM) $(libdir)]intl.lib; 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) libgnuintl.h - $(RM) libintl.h - $(RM) *.obj - $(RM) *.olb +clean : + $(RM) libgnuintl.h;* + $(RM) libintl.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'." diff --git a/gettext-runtime/lib/ChangeLog b/gettext-runtime/lib/ChangeLog index 6d80545..ca27230 100644 --- a/gettext-runtime/lib/ChangeLog +++ b/gettext-runtime/lib/ChangeLog @@ -1,3 +1,10 @@ +2003-04-12 Bruno Haible <bruno@clisp.org> + + * 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-05 Bruno Haible <bruno@clisp.org> * Makefile.am (DEFS): Define DEPENDS_ON_LIBINTL, for relocatable.c. diff --git a/gettext-runtime/lib/Makefile.vms b/gettext-runtime/lib/Makefile.vms index 7c8763d..438844e 100644 --- a/gettext-runtime/lib/Makefile.vms +++ b/gettext-runtime/lib/Makefile.vms @@ -6,11 +6,16 @@ CC = cc +# 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") +CFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) +DEFS = "VMS=1","HAVE_CONFIG_H=1" INCLUDES = /include=([],[-],[-.intl],[-.-.gettext-tools.lib]) @@ -25,51 +30,56 @@ RM = delete OBJECTS = basename.obj,error.obj,getopt.obj,getopt1.obj,progname.obj,relocatable.obj,xmalloc.obj,xstrdup.obj all : grt.olb + write sys$output "Nothing else to be done for 'all'." basename.obj : [-.-.gettext-tools.lib]basename.c - $(CC) $(INCLUDES) $(CFLAGS) [-.-.gettext-tools.lib]basename.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]basename.c error.obj : [-.-.gettext-tools.lib]error.c - $(CC) $(INCLUDES) $(CFLAGS) [-.-.gettext-tools.lib]error.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]error.c getopt.obj : [-.-.gettext-tools.lib]getopt.c - $(CC) $(INCLUDES) $(CFLAGS) [-.-.gettext-tools.lib]getopt.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]getopt.c getopt1.obj : [-.-.gettext-tools.lib]getopt1.c - $(CC) $(INCLUDES) $(CFLAGS) [-.-.gettext-tools.lib]getopt1.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]getopt1.c progname.obj : [-.-.gettext-tools.lib]progname.c - $(CC) $(INCLUDES) $(CFLAGS) [-.-.gettext-tools.lib]progname.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]progname.c relocatable.obj : [-.-.gettext-tools.lib]relocatable.c - $(CC) $(INCLUDES) $(CFLAGS) [-.-.gettext-tools.lib]relocatable.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]relocatable.c xmalloc.obj : [-.-.gettext-tools.lib]xmalloc.c - $(CC) $(INCLUDES) $(CFLAGS) [-.-.gettext-tools.lib]xmalloc.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]xmalloc.c xstrdup.obj : [-.-.gettext-tools.lib]xstrdup.c - $(CC) $(INCLUDES) $(CFLAGS) [-.-.gettext-tools.lib]xstrdup.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) [-.-.gettext-tools.lib]xstrdup.c grt.olb : $(OBJECTS) - $(RM) grt.olb $(AR) $(AR_FLAGS) grt.olb $(OBJECTS) install : all + write sys$output "Nothing else to be done for 'install'." installdirs : + write sys$output "Nothing to be done for 'installdirs'." uninstall : + write sys$output "Nothing to be done for 'uninstall'." check : + write sys$output "Nothing to be done for 'check'." mostlyclean : clean + write sys$output "Nothing else to be done for 'mostlyclean'." -clean : force - $(RM) *.obj - $(RM) *.olb +clean : + $(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'." 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'." diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog index 797e2db..6c65684 100644 --- a/gettext-runtime/man/ChangeLog +++ b/gettext-runtime/man/ChangeLog @@ -1,5 +1,11 @@ 2003-04-12 Bruno Haible <bruno@clisp.org> + * Makefile.vms: Avoid rules with no lines. 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. (mandir, docdir): Use it instead of prefix. diff --git a/gettext-runtime/man/Makefile.vms b/gettext-runtime/man/Makefile.vms index 87b6a7d..8a0358c 100644 --- a/gettext-runtime/man/Makefile.vms +++ b/gettext-runtime/man/Makefile.vms @@ -21,9 +21,11 @@ INSTALL_DATA = copy #### End of system configuration section. #### all : + write sys$output "Nothing to be done for 'all'." -install : all,force +install : all create /directory $(prefix)] + create /directory $(datadir)] create /directory $(mandir)] create /directory $(man1dir)] $(INSTALL_DATA) gettext.1.in $(man1dir)]gettext.1 @@ -38,7 +40,7 @@ install : all,force $(INSTALL_DATA) dcgettext.3 $(man3dir)]dcgettext.3 $(INSTALL_DATA) dngettext.3 $(man3dir)]dngettext.3 $(INSTALL_DATA) dcngettext.3 $(man3dir)]dcngettext.3 - create /directory $(prefix).doc] + create /directory $(datadir).doc] create /directory $(docdir)] $(INSTALL_DATA) gettext.1.html.in $(docdir)]gettext.1.html $(INSTALL_DATA) ngettext.1.html.in $(docdir)]ngettext.1.html @@ -48,42 +50,46 @@ install : all,force $(INSTALL_DATA) bindtextdomain.3.html $(docdir)]bindtextdomain.3.html $(INSTALL_DATA) bind_textdomain_codeset.3.html $(docdir)]bind_textdomain_codeset.3.html -installdirs : force +installdirs : create /directory $(prefix)] + create /directory $(datadir)] create /directory $(mandir)] create /directory $(man1dir)] create /directory $(man3dir)] - create /directory $(prefix).doc] + create /directory $(datadir).doc] create /directory $(docdir)] -uninstall : force - $(RM) $(man1dir)]gettext.1 - $(RM) $(man1dir)]ngettext.1 - $(RM) $(man3dir)]gettext.3 - $(RM) $(man3dir)]ngettext.3 - $(RM) $(man3dir)]textdomain.3 - $(RM) $(man3dir)]bindtextdomain.3 - $(RM) $(man3dir)]bind_textdomain_codeset.3 - $(RM) $(man3dir)]dgettext.3 - $(RM) $(man3dir)]dcgettext.3 - $(RM) $(man3dir)]dngettext.3 - $(RM) $(man3dir)]dcngettext.3 - $(RM) $(docdir)]gettext.1.html - $(RM) $(docdir)]ngettext.1.html - $(RM) $(docdir)]gettext.3.html - $(RM) $(docdir)]ngettext.3.html - $(RM) $(docdir)]textdomain.3.html - $(RM) $(docdir)]bindtextdomain.3.html - $(RM) $(docdir)]bind_textdomain_codeset.3.html +uninstall : + $(RM) $(man1dir)]gettext.1; + $(RM) $(man1dir)]ngettext.1; + $(RM) $(man3dir)]gettext.3; + $(RM) $(man3dir)]ngettext.3; + $(RM) $(man3dir)]textdomain.3; + $(RM) $(man3dir)]bindtextdomain.3; + $(RM) $(man3dir)]bind_textdomain_codeset.3; + $(RM) $(man3dir)]dgettext.3; + $(RM) $(man3dir)]dcgettext.3; + $(RM) $(man3dir)]dngettext.3; + $(RM) $(man3dir)]dcngettext.3; + $(RM) $(docdir)]gettext.1.html; + $(RM) $(docdir)]ngettext.1.html; + $(RM) $(docdir)]gettext.3.html; + $(RM) $(docdir)]ngettext.3.html; + $(RM) $(docdir)]textdomain.3.html; + $(RM) $(docdir)]bindtextdomain.3.html; + $(RM) $(docdir)]bind_textdomain_codeset.3.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 +clean : + write sys$output "Nothing to be done for 'clean'." 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'." diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog index 3319f9c..bf8da6d 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,9 @@ +2003-04-12 Bruno Haible <bruno@clisp.org> + + * Makefile.vms: New variables ABIFLAGS, DEFS. Avoid rules with no + lines. Don't use the force target. Correct wildcard syntax. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + 2003-03-30 Bruno Haible <bruno@clisp.org> * Makefile.vms: New file. diff --git a/gettext-runtime/src/Makefile.vms b/gettext-runtime/src/Makefile.vms index 502d99f..e8e66ee 100644 --- a/gettext-runtime/src/Makefile.vms +++ b/gettext-runtime/src/Makefile.vms @@ -13,11 +13,16 @@ localedir = $(datadir).locale CC = cc +# 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","LOCALEDIR=""$(localedir)]""") +CFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) +DEFS = "VMS=1","HAVE_CONFIG_H=1","LOCALEDIR=""$(localedir)]""" INCLUDES = /include=([],[-],[-.intl],[-.lib],[-.-.gettext-tools.lib]) @@ -39,45 +44,48 @@ gettext_OBJECTS = gettext.obj ngettext_OBJECTS = ngettext.obj all : $(PROGRAMS) + write sys$output "Nothing else to be done for 'all'." gettext.obj : gettext.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") gettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") gettext.c ngettext.obj : ngettext.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") ngettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") ngettext.c gettext.exe : $(gettext_OBJECTS) - link /executable=gettext.exe $(gettext_OBJECTS) [-.lib]grt.olb $(LDADD) + link /executable=gettext.exe $(gettext_OBJECTS),[-.lib]grt.olb/lib,[-.intl]intl.olb/lib,$(LDADD) ngettext.exe : $(ngettext_OBJECTS) - link /executable=ngettext.exe $(ngettext_OBJECTS) [-.lib]grt.olb $(LDADD) + link /executable=ngettext.exe $(ngettext_OBJECTS),[-.lib]grt.olb/lib,[-.intl]intl.olb/lib,$(LDADD) -install : all,force +install : all create /directory $(prefix)] create /directory $(exec_prefix)] create /directory $(bindir)] $(INSTALL_PROGRAM) gettext.exe $(bindir)]gettext.exe $(INSTALL_PROGRAM) ngettext.exe $(bindir)]ngettext.exe -installdirs : force +installdirs : create /directory $(prefix)] create /directory $(exec_prefix)] create /directory $(bindir)] -uninstall : force - $(RM) $(bindir)]gettext.exe - $(RM) $(bindir)]ngettext.exe +uninstall : + $(RM) $(bindir)]gettext.exe; + $(RM) $(bindir)]ngettext.exe; 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) *.obj - $(RM) $(PROGRAMS) +clean : + $(RM) *.obj;* + $(RM) *.exe;* 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'." diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog index 6bf6e2d..556ad8d 100644 --- a/gettext-tools/ChangeLog +++ b/gettext-tools/ChangeLog @@ -1,5 +1,12 @@ 2003-04-12 Bruno Haible <bruno@clisp.org> + * Makefile.am (config.h_vms): Renamed from config.h.vms. + * Makefile.vms: Don't use the force target. Use config.h_vms, not + config.h.vms. Create intl subdirectory. Correct wildcard syntax. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + +2003-04-12 Bruno Haible <bruno@clisp.org> + * configure.ac (mandir): Change default value. * Makefile.msvc (mandir, docdir): Use datadir instead of prefix. diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am index 0436093..a52863b 100644 --- a/gettext-tools/Makefile.am +++ b/gettext-tools/Makefile.am @@ -46,10 +46,12 @@ html: # VMS support. -config.h.vms: config.h.in ../version.sh - (sed -e 's/#undef ENABLE_NLS$$/#define ENABLE_NLS 1/' \ +config.h_vms: config.h.in ../version.sh + (echo '#define KEEP_CRTL_SETLOCALE 1'; echo '#include <vms_jackets.h>'; echo '#undef realpath'; \ + sed -e 's/#undef ENABLE_NLS$$/#define ENABLE_NLS 1/' \ -e 's/#undef HAVE_ALLOCA$$/#define HAVE_ALLOCA 1/' \ -e 's/#undef HAVE_ARPA_INET_H$$/#define HAVE_ARPA_INET_H 1/' \ + -e 's/#undef HAVE_CHOWN$$/#define HAVE_CHOWN 1/' \ -e 's/#undef HAVE_DECL_WCWIDTH$$/#define HAVE_DECL_WCWIDTH 1/' \ -e 's/#undef HAVE_DIRENT_H$$/#define HAVE_DIRENT_H 1/' \ -e 's/#undef HAVE_DLFCN_H$$/#define HAVE_DLFCN_H 1/' \ @@ -67,7 +69,6 @@ config.h.vms: config.h.in ../version.sh -e 's/#undef HAVE_GETUID$$/#define HAVE_GETUID 1/' \ -e 's/#undef HAVE_ICONV$$/#define HAVE_ICONV 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_ISASCII$$/#define HAVE_ISASCII 1/' \ -e 's/#undef HAVE_ISWCNTRL$$/#define HAVE_ISWCNTRL 1/' \ -e 's/#undef HAVE_ISWPRINT$$/#define HAVE_ISWPRINT 1/' \ @@ -112,7 +113,6 @@ config.h.vms: config.h.in ../version.sh -e 's/#undef HAVE_SYS_TIME_H$$/#define HAVE_SYS_TIME_H 1/' \ -e 's/#undef HAVE_SYS_TYPES_H$$/#define HAVE_SYS_TYPES_H 1/' \ -e 's/#undef HAVE_TIME_H$$/#define HAVE_TIME_H 1/' \ - -e 's/#undef HAVE_UINTMAX_T$$/#define HAVE_UINTMAX_T 1/' \ -e 's/#undef HAVE_UNAME$$/#define HAVE_UNAME 1/' \ -e 's/#undef HAVE_UNISTD_H$$/#define HAVE_UNISTD_H 1/' \ -e 's/#undef HAVE_UNSETENV$$/#define HAVE_UNSETENV 1/' \ @@ -133,13 +133,14 @@ config.h.vms: config.h.in ../version.sh -e 's/#undef fnmatch$$/#define fnmatch rpl_fnmatch/' \ -e 's/#undef getline$$/#define getline rpl_getline/' \ -e 's/#undef realpath$$/#define realpath rpl_realpath/' \ + -e 's/#undef uintmax_t$$/#define uintmax_t unsigned long long/' \ -e 's/#undef PACKAGE$$/#define PACKAGE "gettext-tools"/' \ -e 's/#undef VERSION$$/#define VERSION "$(VERSION)"/' \ - < $<; echo; echo '#define alloca __ALLOCA'; echo '#define pw_gecos pw_name'; echo '#define KEEP_CRTL_SETLOCALE 1'; echo '#include <vms_jackets.h>') > $@ + < $<; echo; echo '#define alloca __ALLOCA'; echo '#define pw_gecos pw_name') > $@ # vms_jackets.h is a header that comes with Compaq's "porting library". # KEEP_CRTL_SETLOCALE tells it to not override the native locale support. -EXTRA_DIST += Makefile.vms config.h.vms +EXTRA_DIST += Makefile.vms config.h_vms # Woe32 support. diff --git a/gettext-tools/Makefile.vms b/gettext-tools/Makefile.vms index fb82be8..6d56f82 100644 --- a/gettext-tools/Makefile.vms +++ b/gettext-tools/Makefile.vms @@ -9,10 +9,11 @@ RM = delete #### End of system configuration section. #### -all : config.h,force +all : config.h set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all set default [-] + create /directory [.intl] set default [.intl] $(MMS) $(MMSQUALIFIERS) /description=[-.-.gettext-runtime.intl]Makefile.vms srcdir=[-.-.gettext-runtime.intl] all set default [-] @@ -41,11 +42,10 @@ all : config.h,force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms all set default [-] -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 -install : force +install : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install set default [-] @@ -77,7 +77,7 @@ install : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms install set default [-] -installdirs : force +installdirs : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs set default [-] @@ -109,7 +109,7 @@ installdirs : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms installdirs set default [-] -uninstall : force +uninstall : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall set default [-] @@ -141,7 +141,7 @@ uninstall : force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms uninstall set default [-] -check : all,force +check : all set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check set default [-] @@ -173,7 +173,7 @@ check : all,force $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms check set default [-] -mostlyclean : force +mostlyclean : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean set default [-] @@ -204,9 +204,9 @@ mostlyclean : force set default [.tests] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms mostlyclean set default [-] - $(RM) config.h + $(RM) config.h;* -clean : force +clean : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean set default [-] @@ -237,9 +237,9 @@ clean : force set default [.tests] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms clean set default [-] - $(RM) config.h + $(RM) config.h;* -distclean : force +distclean : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean set default [-] @@ -270,9 +270,9 @@ distclean : force set default [.tests] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms distclean set default [-] - $(RM) config.h + $(RM) config.h;* -maintainer-clean : force +maintainer-clean : set default [.doc] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean set default [-] @@ -303,6 +303,4 @@ maintainer-clean : force set default [.tests] $(MMS) $(MMSQUALIFIERS) /description=Makefile.vms maintainer-clean set default [-] - $(RM) config.h - -force : + $(RM) config.h;* diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog index df0affb..b0c1093 100644 --- a/gettext-tools/doc/ChangeLog +++ b/gettext-tools/doc/ChangeLog @@ -1,5 +1,10 @@ 2003-04-12 Bruno Haible <bruno@clisp.org> + * Makefile.vms: Don't use the force target. Avoid rules with no lines. + 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. (docdir): Use it instead of prefix. diff --git a/gettext-tools/doc/Makefile.vms b/gettext-tools/doc/Makefile.vms index 8a53153..218d260 100644 --- a/gettext-tools/doc/Makefile.vms +++ b/gettext-tools/doc/Makefile.vms @@ -18,29 +18,35 @@ INSTALL_DATA = copy #### End of system configuration section. #### all : + write sys$output "Nothing to be done for 'all'." -install : all,force +install : all create /directory $(prefix)] - create /directory $(prefix).doc] + create /directory $(datadir)] + create /directory $(datadir).doc] create /directory $(docdir)] $(INSTALL_DATA) gettext_*.html $(docdir) -installdirs : force +installdirs : create /directory $(prefix)] - create /directory $(prefix).doc] + create /directory $(datadir)] + create /directory $(datadir).doc] create /directory $(docdir)] -uninstall : force - $(RM) $(docdir)]gettext_*.html +uninstall : + $(RM) $(docdir)]gettext_*.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 +clean : + write sys$output "Nothing to be done for 'clean'." 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'." diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index dc7d038..ce56f27 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,5 +1,12 @@ 2003-04-12 Bruno Haible <bruno@clisp.org> + * Makefile.vms: New variables ABIFLAGS, DEFS. Avoid rules with no + lines. Update library creation rule. Don't use the force target. + Correct wildcard syntax. Create fnmatch.h. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + +2003-04-12 Bruno Haible <bruno@clisp.org> + * localcharset.c (get_charset_aliases): Add special case for VMS. 2003-04-10 Bruno Haible <bruno@clisp.org> diff --git a/gettext-tools/lib/Makefile.vms b/gettext-tools/lib/Makefile.vms index fdd6f96..e5a54e3 100644 --- a/gettext-tools/lib/Makefile.vms +++ b/gettext-tools/lib/Makefile.vms @@ -11,11 +11,16 @@ libdir = $(exec_prefix).lib CC = cc +# 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","EXEEXT="".exe""","LIBDIR=""$(libdir)]""") +CFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) +DEFS = "VMS=1","HAVE_CONFIG_H=1","EXEEXT="".exe""","LIBDIR=""$(libdir)]""" INCLUDES = /include=([],[-],[-.intl]) @@ -55,7 +60,6 @@ OBJECTS = \ concatpath.obj, \ pipe-bidi.obj, pipe-in.obj, pipe-out.obj, \ progname.obj, progreloc.obj, \ - relocatable.obj, \ safe-read.obj, \ safe-write.obj, \ sh-quote.obj, \ @@ -74,163 +78,168 @@ OBJECTS = \ stpcpy.obj, \ vasprintf.obj -all : gettextlib.olb +all : fnmatch.h gettextlib.olb + write sys$output "Nothing else to be done for 'all'." + +fnmatch.h : pfnmatch.h + $(LN) pfnmatch.h fnmatch.h argmatch.obj : argmatch.c - $(CC) $(INCLUDES) $(CFLAGS) argmatch.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) argmatch.c backupfile.obj : backupfile.c - $(CC) $(INCLUDES) $(CFLAGS) backupfile.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) backupfile.c addext.obj : addext.c - $(CC) $(INCLUDES) $(CFLAGS) addext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) addext.c basename.obj : basename.c - $(CC) $(INCLUDES) $(CFLAGS) basename.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) basename.c c-ctype.obj : c-ctype.c - $(CC) $(INCLUDES) $(CFLAGS) c-ctype.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) c-ctype.c classpath.obj : classpath.c - $(CC) $(INCLUDES) $(CFLAGS) classpath.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) classpath.c copy-file.obj : copy-file.c - $(CC) $(INCLUDES) $(CFLAGS) copy-file.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) copy-file.c error.obj : error.c - $(CC) $(INCLUDES) $(CFLAGS) error.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) error.c execute.obj : execute.c - $(CC) $(INCLUDES) $(CFLAGS) execute.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) execute.c findprog.obj : findprog.c - $(CC) $(INCLUDES) $(CFLAGS) findprog.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) findprog.c fstrcmp.obj : fstrcmp.c - $(CC) $(INCLUDES) $(CFLAGS) fstrcmp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) fstrcmp.c full-write.obj : full-write.c - $(CC) $(INCLUDES) $(CFLAGS) full-write.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) full-write.c gcd.obj : gcd.c - $(CC) $(INCLUDES) $(CFLAGS) gcd.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) gcd.c getopt.obj : getopt.c - $(CC) $(INCLUDES) $(CFLAGS) getopt.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) getopt.c getopt1.obj : getopt1.c - $(CC) $(INCLUDES) $(CFLAGS) getopt1.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) getopt1.c hash.obj : hash.c - $(CC) $(INCLUDES) $(CFLAGS) hash.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) hash.c javacomp.obj : javacomp.c - $(CC) $(INCLUDES) $(CFLAGS) javacomp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) javacomp.c javaexec.obj : javaexec.c - $(CC) $(INCLUDES) $(CFLAGS) javaexec.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) javaexec.c linebreak.obj : linebreak.c - $(CC) $(INCLUDES) $(CFLAGS) linebreak.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) linebreak.c mbswidth.obj : mbswidth.c - $(CC) $(INCLUDES) $(CFLAGS) mbswidth.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) mbswidth.c obstack.obj : obstack.c - $(CC) $(INCLUDES) $(CFLAGS) obstack.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) obstack.c concatpath.obj : concatpath.c - $(CC) $(INCLUDES) $(CFLAGS) concatpath.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) concatpath.c pipe-bidi.obj : pipe-bidi.c - $(CC) $(INCLUDES) $(CFLAGS) pipe-bidi.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) pipe-bidi.c pipe-in.obj : pipe-in.c - $(CC) $(INCLUDES) $(CFLAGS) pipe-in.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) pipe-in.c pipe-out.obj : pipe-out.c - $(CC) $(INCLUDES) $(CFLAGS) pipe-out.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) pipe-out.c progname.obj : progname.c - $(CC) $(INCLUDES) $(CFLAGS) progname.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) progname.c progreloc.obj : progreloc.c - $(CC) $(INCLUDES) $(CFLAGS) progreloc.c - -relocatable.obj : relocatable.c - $(CC) $(INCLUDES) $(CFLAGS) relocatable.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) progreloc.c safe-read.obj : safe-read.c - $(CC) $(INCLUDES) $(CFLAGS) safe-read.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) safe-read.c safe-write.obj : safe-write.c - $(CC) $(INCLUDES) $(CFLAGS) safe-write.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) safe-write.c sh-quote.obj : sh-quote.c - $(CC) $(INCLUDES) $(CFLAGS) sh-quote.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) sh-quote.c stpncpy.obj : stpncpy.c - $(CC) $(INCLUDES) $(CFLAGS) stpncpy.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) stpncpy.c strtoul.obj : strtoul.c - $(CC) $(INCLUDES) $(CFLAGS) strtoul.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) strtoul.c tmpdir.obj : tmpdir.c - $(CC) $(INCLUDES) $(CFLAGS) tmpdir.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) tmpdir.c wait-process.obj : wait-process.c - $(CC) $(INCLUDES) $(CFLAGS) wait-process.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) wait-process.c xerror.obj : xerror.c - $(CC) $(INCLUDES) $(CFLAGS) xerror.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xerror.c xmalloc.obj : xmalloc.c - $(CC) $(INCLUDES) $(CFLAGS) xmalloc.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xmalloc.c xstrdup.obj : xstrdup.c - $(CC) $(INCLUDES) $(CFLAGS) xstrdup.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xstrdup.c xsetenv.obj : xsetenv.c - $(CC) $(INCLUDES) $(CFLAGS) xsetenv.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) xsetenv.c getline.obj : getline.c - $(CC) $(INCLUDES) $(CFLAGS) getline.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) getline.c mkdtemp.obj : mkdtemp.c - $(CC) $(INCLUDES) $(CFLAGS) mkdtemp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) mkdtemp.c -pfnmatch.obj : pfnmatch.c - $(CC) $(INCLUDES) $(CFLAGS) pfnmatch.c +pfnmatch.obj : pfnmatch.c fnmatch.h + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) pfnmatch.c relocatable.obj : relocatable.c - $(CC) $(INCLUDES) $(CFLAGS) relocatable.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) relocatable.c stpcpy.obj : stpcpy.c - $(CC) $(INCLUDES) $(CFLAGS) stpcpy.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) stpcpy.c vasprintf.obj : vasprintf.c - $(CC) $(INCLUDES) $(CFLAGS) vasprintf.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) vasprintf.c gettextlib.olb : $(OBJECTS) - $(RM) gettextlib.olb $(AR) $(AR_FLAGS) gettextlib.olb $(OBJECTS) -install : all,force +install : all + write sys$output "Nothing else to be done for 'install'." -installdirs : force +installdirs : + write sys$output "Nothing to be done for 'installdirs'." -uninstall : force +uninstall : + write sys$output "Nothing to be done for 'uninstall'." 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) *.obj - $(RM) *.olb +clean : + $(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'." diff --git a/gettext-tools/libuniname/ChangeLog b/gettext-tools/libuniname/ChangeLog index d6ceb77..987bdae 100644 --- a/gettext-tools/libuniname/ChangeLog +++ b/gettext-tools/libuniname/ChangeLog @@ -1,3 +1,10 @@ +2003-04-12 Bruno Haible <bruno@clisp.org> + + * 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-03-30 Bruno Haible <bruno@clisp.org> * Makefile.vms: New file. diff --git a/gettext-tools/libuniname/Makefile.vms b/gettext-tools/libuniname/Makefile.vms index 4a42505..25c46a8 100644 --- a/gettext-tools/libuniname/Makefile.vms +++ b/gettext-tools/libuniname/Makefile.vms @@ -6,11 +6,16 @@ CC = cc +# 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") +CFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) +DEFS = "VMS=1","HAVE_CONFIG_H=1" INCLUDES = /include=([],[-],[-.lib]) @@ -25,30 +30,35 @@ RM = delete OBJECTS = uniname.obj all : uniname.olb + write sys$output "Nothing else to be done for 'all'." uniname.obj : uniname.c - $(CC) $(INCLUDES) $(CFLAGS) uniname.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) uniname.c uniname.olb : $(OBJECTS) - $(RM) uniname.olb $(AR) $(AR_FLAGS) uniname.olb $(OBJECTS) install : all + write sys$output "Nothing else to be done for 'install'." installdirs : + write sys$output "Nothing to be done for 'installdirs'." uninstall : + write sys$output "Nothing to be done for 'uninstall'." check : + write sys$output "Nothing to be done for 'check'." mostlyclean : clean + write sys$output "Nothing else to be done for 'mostlyclean'." -clean : force - $(RM) *.obj - $(RM) *.olb +clean : + $(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'." diff --git a/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog index 20d0d58..902f9a7 100644 --- a/gettext-tools/man/ChangeLog +++ b/gettext-tools/man/ChangeLog @@ -1,5 +1,11 @@ 2003-04-12 Bruno Haible <bruno@clisp.org> + * Makefile.vms: Avoid rules with no lines. 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. (mandir, docdir): Use it instead of prefix. diff --git a/gettext-tools/man/Makefile.vms b/gettext-tools/man/Makefile.vms index 53c84ff..aa0bc59 100644 --- a/gettext-tools/man/Makefile.vms +++ b/gettext-tools/man/Makefile.vms @@ -20,9 +20,11 @@ INSTALL_DATA = copy #### End of system configuration section. #### all : + write sys$output "Nothing to be done for 'all'." -install : all,force +install : all create /directory $(prefix)] + create /directory $(datadir)] create /directory $(mandir)] create /directory $(man1dir)] $(INSTALL_DATA) msgcmp.1 $(man1dir)]msgcmp.1 @@ -40,7 +42,7 @@ install : all,force $(INSTALL_DATA) msggrep.1 $(man1dir)]msggrep.1 $(INSTALL_DATA) msginit.1 $(man1dir)]msginit.1 $(INSTALL_DATA) msguniq.1 $(man1dir)]msguniq.1 - create /directory $(prefix).doc] + create /directory $(datadir).doc] create /directory $(docdir)] $(INSTALL_DATA) msgcmp.1.html $(docdir)]msgcmp.1.html $(INSTALL_DATA) msgfmt.1.html $(docdir)]msgfmt.1.html @@ -58,53 +60,57 @@ install : all,force $(INSTALL_DATA) msginit.1.html $(docdir)]msginit.1.html $(INSTALL_DATA) msguniq.1.html $(docdir)]msguniq.1.html -installdirs : force +installdirs : create /directory $(prefix)] + create /directory $(datadir)] create /directory $(mandir)] create /directory $(man1dir)] - create /directory $(prefix).doc] + create /directory $(datadir).doc] create /directory $(docdir)] -uninstall : force - $(RM) $(man1dir)]msgcmp.1 - $(RM) $(man1dir)]msgfmt.1 - $(RM) $(man1dir)]msgmerge.1 - $(RM) $(man1dir)]msgunfmt.1 - $(RM) $(man1dir)]xgettext.1 - $(RM) $(man1dir)]msgattrib.1 - $(RM) $(man1dir)]msgcat.1 - $(RM) $(man1dir)]msgcomm.1 - $(RM) $(man1dir)]msgconv.1 - $(RM) $(man1dir)]msgen.1 - $(RM) $(man1dir)]msgexec.1 - $(RM) $(man1dir)]msgfilter.1 - $(RM) $(man1dir)]msggrep.1 - $(RM) $(man1dir)]msginit.1 - $(RM) $(man1dir)]msguniq.1 - $(RM) $(docdir)]msgcmp.1.html - $(RM) $(docdir)]msgfmt.1.html - $(RM) $(docdir)]msgmerge.1.html - $(RM) $(docdir)]msgunfmt.1.html - $(RM) $(docdir)]xgettext.1.html - $(RM) $(docdir)]msgattrib.1.html - $(RM) $(docdir)]msgcat.1.html - $(RM) $(docdir)]msgcomm.1.html - $(RM) $(docdir)]msgconv.1.html - $(RM) $(docdir)]msgen.1.html - $(RM) $(docdir)]msgexec.1.html - $(RM) $(docdir)]msgfilter.1.html - $(RM) $(docdir)]msggrep.1.html - $(RM) $(docdir)]msginit.1.html - $(RM) $(docdir)]msguniq.1.html +uninstall : + $(RM) $(man1dir)]msgcmp.1; + $(RM) $(man1dir)]msgfmt.1; + $(RM) $(man1dir)]msgmerge.1; + $(RM) $(man1dir)]msgunfmt.1; + $(RM) $(man1dir)]xgettext.1; + $(RM) $(man1dir)]msgattrib.1; + $(RM) $(man1dir)]msgcat.1; + $(RM) $(man1dir)]msgcomm.1; + $(RM) $(man1dir)]msgconv.1; + $(RM) $(man1dir)]msgen.1; + $(RM) $(man1dir)]msgexec.1; + $(RM) $(man1dir)]msgfilter.1; + $(RM) $(man1dir)]msggrep.1; + $(RM) $(man1dir)]msginit.1; + $(RM) $(man1dir)]msguniq.1; + $(RM) $(docdir)]msgcmp.1.html; + $(RM) $(docdir)]msgfmt.1.html; + $(RM) $(docdir)]msgmerge.1.html; + $(RM) $(docdir)]msgunfmt.1.html; + $(RM) $(docdir)]xgettext.1.html; + $(RM) $(docdir)]msgattrib.1.html; + $(RM) $(docdir)]msgcat.1.html; + $(RM) $(docdir)]msgcomm.1.html; + $(RM) $(docdir)]msgconv.1.html; + $(RM) $(docdir)]msgen.1.html; + $(RM) $(docdir)]msgexec.1.html; + $(RM) $(docdir)]msgfilter.1.html; + $(RM) $(docdir)]msggrep.1.html; + $(RM) $(docdir)]msginit.1.html; + $(RM) $(docdir)]msguniq.1.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 +clean : + write sys$output "Nothing to be done for 'clean'." 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'." diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog index d177c0b..67c82a2 100644 --- a/gettext-tools/misc/ChangeLog +++ b/gettext-tools/misc/ChangeLog @@ -1,3 +1,9 @@ +2003-04-12 Bruno Haible <bruno@clisp.org> + + * Makefile.vms: Avoid rules with no lines. Don't use the force target. + Correct wildcard syntax. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + 2003-04-11 Bruno Haible <bruno@clisp.org> * Makefile.am (archive.tar.gz): Avoid creating an empty tar.gz file. diff --git a/gettext-tools/misc/Makefile.vms b/gettext-tools/misc/Makefile.vms index d6c683c..454d9bc 100644 --- a/gettext-tools/misc/Makefile.vms +++ b/gettext-tools/misc/Makefile.vms @@ -20,8 +20,9 @@ INSTALL_DATA = copy #### End of system configuration section. #### all : + write sys$output "Nothing to be done for 'all'." -install : all,force +install : all create /directory $(prefix)] create /directory $(datadir)] create /directory $(emacsdir)] @@ -29,24 +30,27 @@ install : all,force $(INSTALL_DATA) po-mode.el $(lispdir)]po-mode.el $(INSTALL_DATA) po-compat.el $(lispdir)]po-compat.el -installdirs : force +installdirs : create /directory $(prefix)] create /directory $(datadir)] create /directory $(emacsdir)] create /directory $(lispdir)] -uninstall : force - $(RM) $(lispdir)]po-mode.el - $(RM) $(lispdir)]po-compat.el +uninstall : + $(RM) $(lispdir)]po-mode.el; + $(RM) $(lispdir)]po-compat.el; 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 +clean : + write sys$output "Nothing to be done for 'clean'." 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'." diff --git a/gettext-tools/projects/ChangeLog b/gettext-tools/projects/ChangeLog index bb2cfb6..4c395d3 100644 --- a/gettext-tools/projects/ChangeLog +++ b/gettext-tools/projects/ChangeLog @@ -1,3 +1,8 @@ +2003-04-12 Bruno Haible <bruno@clisp.org> + + * Makefile.vms: Avoid rules with no lines. Don't use the force target. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + 2003-03-30 Bruno Haible <bruno@clisp.org> * Makefile.vms: New file. diff --git a/gettext-tools/projects/Makefile.vms b/gettext-tools/projects/Makefile.vms index c4791ce..a7d4c0d 100644 --- a/gettext-tools/projects/Makefile.vms +++ b/gettext-tools/projects/Makefile.vms @@ -5,21 +5,28 @@ #### End of system configuration section. #### all : + write sys$output "Nothing to be done for 'all'." install : all + write sys$output "Nothing else to be done for 'install'." installdirs : + write sys$output "Nothing to be done for 'installdirs'." uninstall : + write sys$output "Nothing to be done for 'uninstall'." check : + write sys$output "Nothing to be done for 'check'." mostlyclean : clean + write sys$output "Nothing else to be done for 'mostlyclean'." -clean : force +clean : + write sys$output "Nothing to be done for 'clean'." 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'." diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index dc0af0f..fd9ba94 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,9 @@ +2003-04-12 Bruno Haible <bruno@clisp.org> + + * Makefile.vms: New variables ABIFLAGS, DEFS. Avoid rules with no + lines. Don't use the force target. Correct wildcard syntax. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + 2003-04-13 Bruno Haible <bruno@clisp.org> * xgettext.c (construct_header): Remove spurious comma. diff --git a/gettext-tools/src/Makefile.vms b/gettext-tools/src/Makefile.vms index 6933d31..979beb5 100644 --- a/gettext-tools/src/Makefile.vms +++ b/gettext-tools/src/Makefile.vms @@ -19,11 +19,16 @@ projectsdir = $(pkgdatadir).projects CC = cc +# 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","LOCALEDIR=""$(localedir)]""","GETTEXTJAR=""$(jardir)]gettext.jar""","LIBDIR=""$(libdir)]""","GETTEXTDATADIR=""$(pkgdatadir)]""","PROJECTSDIR=""$(projectsdir)""") +CFLAGS = $(ABIFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) +DEFS = "VMS=1","HAVE_CONFIG_H=1","LOCALEDIR=""$(localedir)]""","GETTEXTJAR=""$(jardir)]gettext.jar""","LIBDIR=""$(libdir)]""","GETTEXTDATADIR=""$(pkgdatadir)]""","PROJECTSDIR=""$(projectsdir)""" INCLUDES = /include=([],[-],[-.libuniname],[-.lib],[-.intl],[-.-.gettext-runtime.intl]) @@ -97,271 +102,271 @@ msginit_OBJECTS = msginit.obj, localealias.obj msguniq_OBJECTS = msguniq.obj all : gettextsrc.olb,$(PROGRAMS) + write sys$output "Nothing else to be done for 'all'." # Compilation rules for $(OBJECTS). message.obj : message.c - $(CC) $(INCLUDES) $(CFLAGS) message.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) message.c po.obj : po.c - $(CC) $(INCLUDES) $(CFLAGS) po.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) po.c po-lex.obj : po-lex.c - $(CC) $(INCLUDES) $(CFLAGS) po-lex.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) po-lex.c po-gram-gen.obj : po-gram-gen.c - $(CC) $(INCLUDES) $(CFLAGS) po-gram-gen.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) po-gram-gen.c po-hash-gen.obj : po-hash-gen.c - $(CC) $(INCLUDES) $(CFLAGS) po-hash-gen.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) po-hash-gen.c po-charset.obj : po-charset.c - $(CC) $(INCLUDES) $(CFLAGS) po-charset.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) po-charset.c open-po.obj : open-po.c - $(CC) $(INCLUDES) $(CFLAGS) open-po.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) open-po.c dir-list.obj : dir-list.c - $(CC) $(INCLUDES) $(CFLAGS) dir-list.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) dir-list.c str-list.obj : str-list.c - $(CC) $(INCLUDES) $(CFLAGS) str-list.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) str-list.c read-po.obj : read-po.c - $(CC) $(INCLUDES) $(CFLAGS) read-po.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) read-po.c write-po.obj : write-po.c - $(CC) $(INCLUDES) $(CFLAGS) write-po.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) write-po.c msgl-ascii.obj : msgl-ascii.c - $(CC) $(INCLUDES) $(CFLAGS) msgl-ascii.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) msgl-ascii.c msgl-iconv.obj : msgl-iconv.c - $(CC) $(INCLUDES) $(CFLAGS) msgl-iconv.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) msgl-iconv.c msgl-equal.obj : msgl-equal.c - $(CC) $(INCLUDES) $(CFLAGS) msgl-equal.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) msgl-equal.c msgl-cat.obj : msgl-cat.c - $(CC) $(INCLUDES) $(CFLAGS) msgl-cat.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) msgl-cat.c msgl-english.obj : msgl-english.c - $(CC) $(INCLUDES) $(CFLAGS) msgl-english.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) msgl-english.c file-list.obj : file-list.c - $(CC) $(INCLUDES) $(CFLAGS) file-list.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) file-list.c msgl-charset.obj : msgl-charset.c - $(CC) $(INCLUDES) $(CFLAGS) msgl-charset.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) msgl-charset.c po-time.obj : po-time.c - $(CC) $(INCLUDES) $(CFLAGS) po-time.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) po-time.c plural.obj : plural.c - $(CC) $(INCLUDES) $(CFLAGS) plural.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) plural.c plural-table.obj : plural-table.c - $(CC) $(INCLUDES) $(CFLAGS) plural-table.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) plural-table.c format.obj : format.c - $(CC) $(INCLUDES) $(CFLAGS) format.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format.c format-c.obj : format-c.c - $(CC) $(INCLUDES) $(CFLAGS) format-c.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-c.c format-python.obj : format-python.c - $(CC) $(INCLUDES) $(CFLAGS) format-python.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-python.c format-lisp.obj : format-lisp.c - $(CC) $(INCLUDES) $(CFLAGS) format-lisp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-lisp.c format-elisp.obj : format-elisp.c - $(CC) $(INCLUDES) $(CFLAGS) format-elisp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-elisp.c format-librep.obj : format-librep.c - $(CC) $(INCLUDES) $(CFLAGS) format-librep.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-librep.c format-java.obj : format-java.c - $(CC) $(INCLUDES) $(CFLAGS) format-java.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-java.c format-awk.obj : format-awk.c - $(CC) $(INCLUDES) $(CFLAGS) format-awk.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-awk.c format-pascal.obj : format-pascal.c - $(CC) $(INCLUDES) $(CFLAGS) format-pascal.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-pascal.c format-ycp.obj : format-ycp.c - $(CC) $(INCLUDES) $(CFLAGS) format-ycp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-ycp.c format-tcl.obj : format-tcl.c - $(CC) $(INCLUDES) $(CFLAGS) format-tcl.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-tcl.c format-php.obj : format-php.c - $(CC) $(INCLUDES) $(CFLAGS) format-php.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) format-php.c gettextsrc.olb : $(OBJECTS) - $(RM) gettextsrc.olb $(AR) $(AR_FLAGS) gettextsrc.olb $(OBJECTS) # Compilation rules for $(program_OBJECTS). msgcmp.obj : msgcmp.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgcmp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgcmp.c msgfmt.obj : msgfmt.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgfmt.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgfmt.c write-mo.obj : write-mo.c - $(CC) $(INCLUDES) $(CFLAGS) write-mo.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) write-mo.c write-java.obj : write-java.c - $(CC) $(INCLUDES) $(CFLAGS) write-java.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) write-java.c write-tcl.obj : write-tcl.c - $(CC) $(INCLUDES) $(CFLAGS) write-tcl.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) write-tcl.c plural-eval.obj : plural-eval.c - $(CC) $(INCLUDES) $(CFLAGS) plural-eval.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) plural-eval.c msgmerge.obj : msgmerge.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgmerge.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgmerge.c msgunfmt.obj : msgunfmt.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgunfmt.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgunfmt.c read-mo.obj : read-mo.c - $(CC) $(INCLUDES) $(CFLAGS) read-mo.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) read-mo.c read-java.obj : read-java.c - $(CC) $(INCLUDES) $(CFLAGS) read-java.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) read-java.c read-tcl.obj : read-tcl.c - $(CC) $(INCLUDES) $(CFLAGS) read-tcl.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) read-tcl.c xgettext.obj : xgettext.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") xgettext.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") xgettext.c x-c.obj : x-c.c - $(CC) $(INCLUDES) $(CFLAGS) x-c.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-c.c x-po.obj : x-po.c - $(CC) $(INCLUDES) $(CFLAGS) x-po.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-po.c x-python.obj : x-python.c - $(CC) $(INCLUDES) $(CFLAGS) x-python.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-python.c x-lisp.obj : x-lisp.c - $(CC) $(INCLUDES) $(CFLAGS) x-lisp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-lisp.c x-elisp.obj : x-elisp.c - $(CC) $(INCLUDES) $(CFLAGS) x-elisp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-elisp.c x-librep.obj : x-librep.c - $(CC) $(INCLUDES) $(CFLAGS) x-librep.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-librep.c x-smalltalk.obj : x-smalltalk.c - $(CC) $(INCLUDES) $(CFLAGS) x-smalltalk.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-smalltalk.c x-java.obj : x-java.c - $(CC) $(INCLUDES) $(CFLAGS) x-java.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-java.c x-awk.obj : x-awk.c - $(CC) $(INCLUDES) $(CFLAGS) x-awk.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-awk.c x-ycp.obj : x-ycp.c - $(CC) $(INCLUDES) $(CFLAGS) x-ycp.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-ycp.c x-tcl.obj : x-tcl.c - $(CC) $(INCLUDES) $(CFLAGS) x-tcl.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-tcl.c x-php.obj : x-php.c - $(CC) $(INCLUDES) $(CFLAGS) x-php.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-php.c x-rst.obj : x-rst.c - $(CC) $(INCLUDES) $(CFLAGS) x-rst.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-rst.c x-glade.obj : x-glade.c - $(CC) $(INCLUDES) $(CFLAGS) x-glade.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-glade.c msgattrib.obj : msgattrib.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgattrib.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgattrib.c msgcat.obj : msgcat.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgcat.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgcat.c msgcomm.obj : msgcomm.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgcomm.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgcomm.c msgconv.obj : msgconv.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgconv.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgconv.c msgen.obj : msgen.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgen.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgen.c msgexec.obj : msgexec.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgexec.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgexec.c msgfilter.obj : msgfilter.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgfilter.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msgfilter.c msggrep.obj : msggrep.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msggrep.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msggrep.c msginit.obj : msginit.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msginit.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msginit.c localealias.obj : [-.-.gettext-runtime.intl]localealias.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("LOCALE_ALIAS_PATH=""$(aliaspath)]""") [-.-.gettext-runtime.intl]localealias.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"LOCALE_ALIAS_PATH=""$(aliaspath)]""") [-.-.gettext-runtime.intl]localealias.c msguniq.obj : msguniq.c - $(CC) $(INCLUDES) $(CFLAGS) /define=("INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msguniq.c + $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS),"INSTALLPREFIX=""$(prefix)]""","INSTALLDIR=""$(bindir)]""") msguniq.c msgcmp.exe : $(msgcmp_OBJECTS) - link /executable=msgcmp.exe $(msgcmp_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgcmp.exe $(msgcmp_OBJECTS),gettextsrc.olb/lib,$(LDADD) msgfmt.exe : $(msgfmt_OBJECTS) - link /executable=msgfmt.exe $(msgfmt_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgfmt.exe $(msgfmt_OBJECTS),gettextsrc.olb/lib,$(LDADD) msgmerge.exe : $(msgmerge_OBJECTS) - link /executable=msgmerge.exe $(msgmerge_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgmerge.exe $(msgmerge_OBJECTS),gettextsrc.olb/lib,$(LDADD) msgunfmt.exe : $(msgunfmt_OBJECTS) - link /executable=msgunfmt.exe $(msgunfmt_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgunfmt.exe $(msgunfmt_OBJECTS),gettextsrc.olb/lib,$(LDADD) xgettext.exe : $(xgettext_OBJECTS) - link /executable=xgettext.exe $(xgettext_OBJECTS) [-.libuniname]uniname.olb gettextsrc.olb $(LDADD_EXPAT) $(LDADD) + link /executable=xgettext.exe $(xgettext_OBJECTS),[-.libuniname]uniname.olb/lib,gettextsrc.olb/lib,$(LDADD_EXPAT),$(LDADD) msgattrib.exe : $(msgattrib_OBJECTS) - link /executable=msgattrib.exe $(msgattrib_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgattrib.exe $(msgattrib_OBJECTS),gettextsrc.olb/lib,$(LDADD) msgcat.exe : $(msgcat_OBJECTS) - link /executable=msgcat.exe $(msgcat_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgcat.exe $(msgcat_OBJECTS),gettextsrc.olb/lib,$(LDADD) msgcomm.exe : $(msgcomm_OBJECTS) - link /executable=msgcomm.exe $(msgcomm_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgcomm.exe $(msgcomm_OBJECTS),gettextsrc.olb/lib,$(LDADD) msgconv.exe : $(msgconv_OBJECTS) - link /executable=msgconv.exe $(msgconv_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgconv.exe $(msgconv_OBJECTS),gettextsrc.olb/lib,$(LDADD) msgen.exe : $(msgen_OBJECTS) - link /executable=msgen.exe $(msgen_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgen.exe $(msgen_OBJECTS),gettextsrc.olb/lib,$(LDADD) msgexec.exe : $(msgexec_OBJECTS) - link /executable=msgexec.exe $(msgexec_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgexec.exe $(msgexec_OBJECTS),gettextsrc.olb/lib,$(LDADD) msgfilter.exe : $(msgfilter_OBJECTS) - link /executable=msgfilter.exe $(msgfilter_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msgfilter.exe $(msgfilter_OBJECTS),gettextsrc.olb/lib,$(LDADD) msggrep.exe : $(msggrep_OBJECTS) - link /executable=msggrep.exe $(msggrep_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msggrep.exe $(msggrep_OBJECTS),gettextsrc.olb/lib,$(LDADD) msginit.exe : $(msginit_OBJECTS) - link /executable=msginit.exe $(msginit_OBJECTS) [-.intl]localename.obj gettextsrc.olb $(LDADD) + link /executable=msginit.exe $(msginit_OBJECTS),[-.intl]localename.obj,gettextsrc.olb/lib,$(LDADD) msguniq.exe : $(msguniq_OBJECTS) - link /executable=msguniq.exe $(msguniq_OBJECTS) gettextsrc.olb $(LDADD) + link /executable=msguniq.exe $(msguniq_OBJECTS),gettextsrc.olb/lib,$(LDADD) -install : all,force +install : all create /directory $(prefix)] create /directory $(exec_prefix)] $(INSTALL_PROGRAM) msgcmp.exe $(bindir)]msgcmp.exe @@ -383,41 +388,43 @@ install : all,force create /directory $(pkgdatadir)] $(INSTALL_DATA) msgunfmt.tcl $(pkgdatadir)]msgunfmt.tcl -installdirs : force +installdirs : create /directory $(prefix)] create /directory $(exec_prefix)] create /directory $(datadir)] create /directory $(pkgdatadir)] -uninstall : force - $(RM) $(bindir)]msgcmp.exe - $(RM) $(bindir)]msgfmt.exe - $(RM) $(bindir)]msgmerge.exe - $(RM) $(bindir)]msgunfmt.exe - $(RM) $(bindir)]xgettext.exe - $(RM) $(bindir)]msgattrib.exe - $(RM) $(bindir)]msgcat.exe - $(RM) $(bindir)]msgcomm.exe - $(RM) $(bindir)]msgconv.exe - $(RM) $(bindir)]msgen.exe - $(RM) $(bindir)]msgexec.exe - $(RM) $(bindir)]msgfilter.exe - $(RM) $(bindir)]msggrep.exe - $(RM) $(bindir)]msginit.exe - $(RM) $(bindir)]msguniq.exe - $(RM) $(pkgdatadir)]msgunfmt.tcl +uninstall : + $(RM) $(bindir)]msgcmp.exe; + $(RM) $(bindir)]msgfmt.exe; + $(RM) $(bindir)]msgmerge.exe; + $(RM) $(bindir)]msgunfmt.exe; + $(RM) $(bindir)]xgettext.exe; + $(RM) $(bindir)]msgattrib.exe; + $(RM) $(bindir)]msgcat.exe; + $(RM) $(bindir)]msgcomm.exe; + $(RM) $(bindir)]msgconv.exe; + $(RM) $(bindir)]msgen.exe; + $(RM) $(bindir)]msgexec.exe; + $(RM) $(bindir)]msgfilter.exe; + $(RM) $(bindir)]msggrep.exe; + $(RM) $(bindir)]msginit.exe; + $(RM) $(bindir)]msguniq.exe; + $(RM) $(pkgdatadir)]msgunfmt.tcl; 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) *.obj - $(RM) *.olb - $(RM) $(PROGRAMS) +clean : + $(RM) *.obj;* + $(RM) *.olb;* + $(RM) *.exe;* 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'." diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index fcb60ec..81c6b6d 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,8 @@ +2003-04-12 Bruno Haible <bruno@clisp.org> + + * Makefile.vms: Avoid rules with no lines. Don't use the force target. + Suggested by Jouk Jansen <joukj@hrem.stm.tudelft.nl>. + 2003-04-06 Bruno Haible <bruno@clisp.org> * lang-c++: Update includes list to match the changed location of diff --git a/gettext-tools/tests/Makefile.vms b/gettext-tools/tests/Makefile.vms index b774777..232113c 100644 --- a/gettext-tools/tests/Makefile.vms +++ b/gettext-tools/tests/Makefile.vms @@ -5,21 +5,28 @@ #### End of system configuration section. #### all : + write sys$output "Nothing to be done for 'all'." install : all + write sys$output "Nothing else to be done for 'install'." installdirs : + write sys$output "Nothing to be done for 'installdirs'." uninstall : + write sys$output "Nothing to be done for 'uninstall'." check : + write sys$output "Nothing to be done for 'check'." mostlyclean : clean + write sys$output "Nothing else to be done for 'mostlyclean'." -clean : force +clean : + write sys$output "Nothing to be done for 'clean'." 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'." |