 +## Additional flags when building libraries and with threads
 +THREADSCPPFLAGS = -D_REENTRANT -D_THREAD_SAFE
 +LIBCPPFLAGS =
-@@ -28,40 +21,24 @@
  
  ## Compiler switch to embed a runtime search path
 -LD_RPATH=	-I
 -LD_RPATH_PRE=	
-+LD_RPATH=	
-+LD_RPATH_PRE =
- 
+-
 -## enable the shared lib loader
 -LDFLAGS += -Wl,-bbigtoc
-+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
-+## (incl. the C++ runtime libs potentially found in the URE lib dir):
-+#ENABLE_RPATH=YES
-+#RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'
-+
-+#SH#  ENABLE_RPATH=YES
-+#SH#  RPATHLDFLAGS="${LD_RPATH_PRE}'$$ORIGIN:$$ORIGIN/../ure-link/lib'"
++LD_RPATH=
++LD_RPATH_PRE=
  
  ## These are the library specific LDFLAGS
  LDFLAGSICUDT=-nodefaultlibs -nostdlib

-
-## The type of assembly needed when pkgdata is used for generating shared libraries.
-GENCCODE_ASSEMBLY=-a xlc
+## Compiler switch to embed a library name
+# The initial tab in the next line is to prevent icu-config from reading it.
+	#LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
+#SH# # We can't depend on MIDDLE_SO_TARGET being set.
+#SH# LD_SONAME=
@@ -68,29 +44,8 @@
  
 ## Shared object suffix
-SOBJ=   so
-# without the -brtl option, the library names use .a. AIX is funny that way.
-SO=	a
-A=	a
-
+SO = so
 ## Non-shared intermediate object suffix
-STATIC_O = o
-

 
 ## Compilation rules
 %.$(STATIC_O): $(srcdir)/%.c
