  
  # Certain files don't compile in -ansi mode (e.g. umutex.c, toolutil.c, and cdatatst.c)
  CFLAGS += -D_ALL_SOURCE
-@@ 11,17 +8,13 @@
- 
- ## Commands to generate dependency files
--GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
--GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)
-+GEN_DEPS.c=  $(CC) -E -MM $(DEFS) $(CPPFLAGS)
-+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+@@ -13,84 +10,30 @@
+ GEN_DEPS.c=	$(CC) -E -MM $(DEFS) $(CPPFLAGS)
+ GEN_DEPS.cc=	$(CXX) -E -MM $(DEFS) $(CPPFLAGS)
  
 -## Commands to link
 -## We need to use the C++ linker, even when linking C programs, since

-LD_SOOPTIONS= -Wl,-bsymbolic
-
-## Commands to make a shared library
-SHLIB.c=    $(AIX_PREDELETE) $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_OPTIONS)
-SHLIB.cc=   $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-bexpall $(LD_OPTIONS)
+## Flags for position independent code
+SHAREDLIBCFLAGS = -fPIC
+SHAREDLIBCXXFLAGS = -fPIC

-
-## The type of assembly needed when pkgdata is used for generating shared libraries.
-GENCCODE_ASSEMBLY=-a xlc
-
 ## 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
-
