Moved Rhapsody's shared library rule from rules.mk to Rhapsody.mk.
authorwtc
Thu, 07 May 1998 07:23:49 +0000
changeset 100 1b2527075933489fb7dc00f1d64c6f3f81cd966e
parent 99 02b57ea376944292711635f27954ac879a99f5c0
child 101 f8f3682d20994b50493fa792810f767f309df7b3
push idunknown
push userunknown
push dateunknown
Moved Rhapsody's shared library rule from rules.mk to Rhapsody.mk.
config/Rhapsody.mk
config/rules.mk
--- a/config/Rhapsody.mk
+++ b/config/Rhapsody.mk
@@ -36,12 +36,13 @@ OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLA
 DEFINES			+= -D_PR_LOCAL_THREADS_ONLY -D_PR_NEED_FAKE_POLL
 
 ARCH			= rhapsody
 
 #DSO_CFLAGS		= -fPIC
 #DSO_LDOPTS		= -Bshareable
 #DSO_LDFLAGS		=
 
-MKSHLIB			= $(CC) -arch ppc -dynamiclib -compatibility_version 1 -current_version 1
+# Do we need this?: -install_name
+MKSHLIB			= $(CC) -arch ppc -dynamiclib -compatibility_version 1 -current_version 1 -all_load
 DLL_SUFFIX		= dylib
 
 #G++INCLUDES		= -I/usr/include/g++
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -253,23 +253,16 @@ 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
-ifeq ($(OS_ARCH)$(OS_RELEASE), Rhapsody5.0)
-	@echo Trying to generate Rhapsody dynamic library.
-	# Do we need this?: -install_name 
-	$(CC) -arch ppc -dynamiclib -compatibility_version 1 -current_version 1 -all_load $(OBJS) -o $@
-
-
-else
 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
@@ -295,17 +288,16 @@ ifeq ($(OS_TARGET), OS2)
 else
 	$(LINK_DLL) -MAP $(DLLBASE) $(OS_LIBS) $(EXTRA_LIBS) $(OBJS)
 endif
 endif
 else
 	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS)
 endif
 endif
-endif
 
 $(PURE_LIBRARY):
 	rm -f $@
 ifneq ($(OS_ARCH), WINNT)
 	$(AR) $(OBJS)
 endif
 	$(RANLIB) $@