Log Message:
-----------
Make AIX compile once agian.  Co-developed/debuged with cbbrowne

Modified Files:
--------------
    slony1-engine/src/backend:
        Makefile (r1.18 -> r1.19)
    slony1-engine/makefiles:
        Makefile.aix (r1.7 -> r1.8)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lsrc/backend/Makefile -Lsrc/backend/Makefile -u -w -r1.18 -r1.19
--- src/backend/Makefile
+++ src/backend/Makefile
@@ -42,7 +42,7 @@
 
 all:	$(ALL)
 
-$(SO_NAME):	$(SO_OBJS) $(POSTGRES_IMP)
+$(SO_NAME):	$(SO_OBJS)
 
 clean distclean maintainer-clean:
 	rm -f $(SO_NAME) $(SO_OBJS)
@@ -67,7 +67,3 @@
       cp $$file $(distdir)/$(subdir)/$$file ; \
     done
 
-ifeq ($(PORTNAME), aix)
-$(POSTGRES_IMP): $(pgbindir)/postgres
-	$(MKLDEXPORT) $(pgbindir)/postgres > $@
-endif
Index: Makefile.aix
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/makefiles/Makefile.aix,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lmakefiles/Makefile.aix -Lmakefiles/Makefile.aix -u -w -r1.7 -r1.8
--- makefiles/Makefile.aix
+++ makefiles/Makefile.aix
@@ -4,8 +4,7 @@
 
 # AIX needs threads for everything that uses libpq
 CFLAGS  += $(PTHREAD_CFLAGS)
-LDFLAGS += $(PTHREAD_LDFLAGS)
-LIBS    += $(PTHREAD_LIBS)
+LDFLAGS += $(PTHREAD_LIBS)
 
 RANLIB= touch
 MK_NO_LORDER= true
@@ -24,7 +23,7 @@
 EXPSUFF= .exp
 IMPSUFF= .imp
 
-POSTGRES_IMP= $(slony_top_builddir)/postgres$(IMPSUFF)
+POSTGRES_IMP= $(pglibdir)/postgres$(IMPSUFF)
 
 MKLDEXPORT=$(slony_top_builddir)/makefiles/mkldexport.sh
 
@@ -35,5 +34,5 @@
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
 %$(DLSUFFIX): %.o %$(EXPSUFF)
-	@echo Making shared library $@ from $*.o, $*$(EXPSUFF) and postgres.imp
-	$(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bI:$(POSTGRES_IMP) -Wl,-bE:$*$(EXPSUFF) $(LIBS)
+	@echo Making shared library $@ from $<,  $*$(EXPSUFF) and postgres.imp
+	$(CC) $(LDFLAGS_SL) -o $@ $< -Wl,-bI:$(POSTGRES_IMP) -Wl,-bE:$(NAME)$(EXPSUFF) $(LIBS)