Merged with HEAD from 8/18 or so. unlabeled-3.14.24.4.4
authorcls%seawood.org
Fri, 20 Aug 1999 16:21:22 +0000
branchunlabeled-3.14.24.4.4
changeset 757 8c42adacea73bf242f599ceec61313e5647a6c10
parent 731 81d4465ffedc15fc1db4ba1918fc130acdf6dc1e
push idunknown
push userunknown
push dateunknown
Merged with HEAD from 8/18 or so.
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -310,17 +310,17 @@ else
 ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1)
 	echo "#!" > $(OBJDIR)/lib$(LIBRARY_NAME)_syms
 	nm -B -C -g $(OBJS) \
 		| awk '/ [T,D] / {print $$3}' \
 		| sed -e 's/^\.//' \
 		| sort -u >> $(OBJDIR)/lib$(LIBRARY_NAME)_syms
 	$(LD) $(XCFLAGS) -o $@ $(OBJS) -bE:$(OBJDIR)/lib$(LIBRARY_NAME)_syms \
 		-bM:SRE -bnoentry $(OS_LIBS) $(EXTRA_LIBS)
-else
+else	# AIX 4.1
 ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
 	echo system windows dll initinstance >w16link
 	echo option map >>w16link
 	echo option oneautodata >>w16link
 	echo option heapsize=32K >>w16link
 	echo option $(OS_DLL_OPTION) >>w16link
 	echo debug $(DEBUGTYPE) all >>w16link
@@ -328,35 +328,45 @@ ifeq ($(OS_TARGET), WIN16)
 	echo file >>w16link
 	echo $(W16OBJS) >>w16link
 	echo $(W16IMPORTS) >>w16link
 	echo $(W16LIBS) >>w16link
 	echo $(W16_EXPORTS) >>w16link
 	echo libfile libentry >>w16link
 	$(LINK) @w16link.
 	rm w16link
-else
+else	# WIN16
 ifeq ($(OS_TARGET), OS2)
 # append ( >> ) doesn't seem to be working under OS/2 gmake. Run through OS/2 shell instead.	
 	@cmd /C "echo LIBRARY $(notdir $(basename $(SHARED_LIBRARY))) INITINSTANCE TERMINSTANCE >$@.def"
 	@cmd /C "echo PROTMODE >>$@.def"
 	@cmd /C "echo CODE    LOADONCALL MOVEABLE DISCARDABLE >>$@.def"
 	@cmd /C "echo DATA    PRELOAD MOVEABLE MULTIPLE NONSHARED >>$@.def"	
 	@cmd /C "echo EXPORTS >>$@.def"
 	@cmd /C "$(FILTER) $(LIBRARY) >> $@.def"
 	$(LINK_DLL) $(DLLBASE) $(OBJS) $(OS_LIBS) $(EXTRA_LIBS) $@.def
 else
 	$(LINK_DLL) -MAP $(DLLBASE) $(OS_LIBS) $(EXTRA_LIBS) $(OBJS)
-endif
-endif
-else
+endif	# OS2
+endif	# WIN16
+else	# WINNT
+ifeq ($(OS_TARGET), OpenVMS)
+	@if test ! -f $(OBJDIR)/VMSuni.opt; then \
+	    echo "Creating universal symbol option file $(OBJDIR)/VMSuni.opt";\
+	    create_opt_uni $(OBJS); \
+	    mv VMSuni.opt $(OBJDIR); \
+	fi
+	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS) $(OBJDIR)/VMSuni.opt
+	@echo "`translate $@`" > $(@:.$(DLL_SUFFIX)=.vms)
+else	# OpenVMS
 	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS)
-endif
-endif
-endif
+endif	# OpenVMS
+endif	# WINNT
+endif	# AIX 4.1
+endif   # USE_AUTOCONF
 
 $(PURE_LIBRARY):
 	rm -f $@
 ifneq ($(OS_ARCH), WINNT)
 	$(AR) $(OBJS)
 endif
 	$(RANLIB) $@