Move DLSUFFIX, AROPT, and CFLAGS_SL settings from template to

Makefile.port, since they are of no use to configure and much of the
library magic happens in Makefile.port anyway.

Use __alpha, not __alpha__, since the former is universally available.
Remove -DNOFIXADE from the compile command line and put it in the port
include file.

src/makefiles/Makefile.aix

@@ -4,6 +4,19 @@ MAKE_EXPORTS= true
 
 RANLIB= touch
 MK_NO_LORDER= true
+AROPT = crs
+
+DLSUFFIX = .so
+ifneq ($(GCC), yes)
+  ifeq ($(host_os), aix3.2.5)
+    CFLAGS_SL = -e _nostart
+  endif
+  ifeq ($(host_os), aix4.1)
+    CFLAGS_SL = -bnoentry
+  endif
+endif
+CFLAGS_SL += -lc
+
 
 EXPSUFF= .exp
 IMPSUFF= .imp

src/makefiles/Makefile.beos

@@ -1,7 +1,13 @@
 MK_NO_LORDER=true
+AROPT = crs
+
 ifdef ELF_SYSTEM
 export_dynamic = -Wl,-E
 endif
+
+DLSUFFIX = .so
+CFLAGS_SL = -fpic -DPIC
+
 %.so: %.o
 	ln -fs $(top_srcdir)/src/backend/postgres _APP_
 	$(CC) -nostart -Xlinker -soname=$@ -o $@ _APP_ $<

src/makefiles/Makefile.bsdi

@@ -1,8 +1,22 @@
-# for bsdi 4.0 ELF
-# if we defined .so in template/bsdi_4.0
+AROPT = cq
+
+# bsdi 4.0 and later is ELF
+DLSUFFIX = .so
+ifeq ($(host_os), bsdi2.0)
+DLSUFFIX = .o
+endif
+ifeq ($(host_os), bsdi2.1)
+DLSUFFIX = .o
+endif
+ifeq ($(findstring bsdi3, $(host_os)), bsdi3)
+DLSUFFIX = .o
+endif
 
 ifeq ($(DLSUFFIX), .so)
+CFLAGS_SL = -fpic
 export_dynamic = -export-dynamic
+else
+CFLAGS_SL =
 endif
 
 %.so: %.o

src/makefiles/Makefile.dgux

@@ -1,2 +1,6 @@
+AROPT = crs
+DLSUFFIX = .so
+CFLAGS_SL = -fpic
+
 %.so: %.o
 	$(CC) -shared -o $@ $<

src/makefiles/Makefile.freebsd

@@ -1,7 +1,12 @@
+AROPT = cq
+
 ifdef ELF_SYSTEM
 export_dynamic = -export-dynamic
 endif
 
+DLSUFFIX = .so
+CFLAGS_SL = -fpic -DPIC
+
 %.so: %.o
 ifdef ELF_SYSTEM
 	$(LD) -x -shared -o $@ $<
@@ -14,4 +19,3 @@ else
 	@rm -f $@
 	$(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic
 endif
-

src/makefiles/Makefile.hpux

@@ -26,6 +26,15 @@ endif
 LDFLAGS+= -Wl,+b -Wl,$(libdir) -Wl,-z
 export_dynamic = -Wl,-E
 
+AROPT = crs
+
+DLSUFFIX = .sl
+ifeq ($(GCC), yes)
+CFLAGS_SL = -fPIC
+else
+CFLAGS_SL = +z
+endif
+
 # Rule for building shared libs (currently used only for regression test
 # shlib ... should go away, since this is not really enough knowledge)
 %.sl: %.o

src/makefiles/Makefile.irix5

@@ -1,7 +1,10 @@
-
 # RANLIB is not used on IRIX 5
 RANLIB= touch
 MK_NO_LORDER= true
+AROPT = crs
+
+DLSUFFIX = .so
+CFLAGS_SL =
 
 %.so: %.o
 	$(LD) -G -Bdynamic -shared -o $@ $< 

src/makefiles/Makefile.linux

@@ -1,5 +1,7 @@
+AROPT = crs
 export_dynamic = -export-dynamic
-MK_NO_LORDER= true
+DLSUFFIX = .so
+CFLAGS_SL = -fpic
 
 %.so: %.o
 	$(CC) -shared -o $@ $<

src/makefiles/Makefile.netbsd

@@ -1,6 +1,12 @@
+AROPT = cq
+
 ifdef ELF_SYSTEM
 export_dynamic = -Wl,-E
 endif
+
+DLSUFFIX = .so
+CFLAGS_SL = -fpic -DPIC
+
 %.so: %.o
 ifdef ELF_SYSTEM
 	$(LD) -x -Bshareable -o $@ $<

src/makefiles/Makefile.openbsd

@@ -1,6 +1,12 @@
+AROPT = cq
+
 ifdef ELF_SYSTEM
 export_dynamic = -Wl,-E
 endif
+
+DLSUFFIX = .so
+CFLAGS_SL = -fpic -DPIC
+
 %.so: %.o
 ifdef ELF_SYSTEM
 	$(LD) -x -Bshareable -o $@ $<

src/makefiles/Makefile.osf

@@ -1,2 +1,8 @@
-%.so:  %.o
+AROPT = crs
+DLSUFFIX = .so
+CFLAGS_SL =
+
+%.so: %.o
 	$(LD) -shared -expect_unresolved '*' -o $@ $<
+
+LDFLAGS += -rpath $(libdir)

src/makefiles/Makefile.qnx4

@@ -1,11 +1,15 @@
 MK_NO_LORDER= true
 CXXFLAGS+= -I/usr/local/lib/gcc-lib/i386-pc-qnx4/egcs-2.91.60/include/g++
 AR= ar
+AROPT = cr
 LD= $(AR)
 LDREL= $(AROPT)
 LDOUT=
 LIBS= -lunix
 LDFLAGS=   $(LIBS)
 
+DLSUFFIX = .so
+CFLAGS_SL =
+
 %$(DLSUFFIX): %.o
-	@echo Cannot make shared library $@ from $*.o
+	@echo 'cannot make shared object $@ from $<'

src/makefiles/Makefile.sco

@@ -1,5 +1,9 @@
 override CFLAGS += -dy
 export_dynamic = -W l,-Bexport
+AROPT = cq
+
+DLSUFFIX = .so
+CFLAGS_SL = -K PIC
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<

src/makefiles/Makefile.solaris

@@ -1,8 +1,17 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.2 2000/10/20 23:57:34 petere Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.3 2000/10/21 22:36:13 petere Exp $
+
+AROPT = crs
 
 ifeq ($(with_gnu_ld), yes)
 export_dynamic = -Wl,-E
 endif
 
+DLSUFFIX = .so
+ifeq ($(GCC), yes)
+CFLAGS_SL = -fPIC
+else
+CFLAGS_SL = -KPIC
+endif
+
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<

src/makefiles/Makefile.sunos4

@@ -1,2 +1,11 @@
+AROPT = cr
+
+DLSUFFIX = .so
+ifeq ($(GCC), yes)
+CFLAGS_SL = -fPIC
+else
+CFLAGS_SL = -PIC
+endif
+
 %.so: %.o
 	$(LD) -dc -dp -Bdynamic -o $@ $<

src/makefiles/Makefile.svr4

@@ -4,6 +4,8 @@
 
 LDFLAGS+= -lc /usr/ucblib/libucb.a -LD-Blargedynsym
 
+DLSUFFIX = .so
+CFLAGS_SL =
+
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
-

src/makefiles/Makefile.ultrix4

@@ -1,7 +1,9 @@
 SHELL=/bin/sh5
+AROPT = crs
 
-#
+DLSUFFIX = .so
 # "-G 0" works for both DEC cc and GNU cc.
-#
+CFLAGS_SL = -G 0
+
 %.so: %.c
 	$(CC) -c -G 0 $(CPPFLAGS) $(CFLAGS) -o $@ $<

src/makefiles/Makefile.univel

@@ -1,8 +1,9 @@
-LDFLAGS+= -lc89
+AROPT = crs
 export_dynamic = -Wl,-Bexport
+DLSUFFIX = .so
+CFLAGS_SL = -K PIC
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
 
 INSTALL= /usr/ucb/install
-

src/makefiles/Makefile.unixware

@@ -1,7 +1,9 @@
+AROPT = crs
 export_dynamic = -Wl,-Bexport
+DLSUFFIX = .so
+CFLAGS_SL = -K PIC
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
 
 INSTALL= /usr/ucb/install
-

src/makefiles/Makefile.win

@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.6 2000/10/20 21:04:13 petere Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.7 2000/10/21 22:36:13 petere Exp $
 LDFLAGS+= -g
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
@@ -11,12 +11,15 @@ SHLIB_LINK=$(DLLLIBS)
 # (see http://sources.redhat.com/cygwin/faq/faq.html#SEC110)
 LIBS:=$(filter-out -lm -lc, $(LIBS))
 
+AROPT = crs
+DLSUFFIX = .dll
+CFLAGS_SL =
+
 %.dll: %.o
 	$(DLLTOOL) --export-all --output-def $*.def $<
 	$(DLLWRAP) -o $@ --def $*.def $< $(top_builddir)/src/utils/dllinit.o $(DLLLIBS)
 	rm -f $*.def
 
-curdir:=$(shell pwd)
-ifeq ($(findstring backend,$(curdir)), backend)
+ifeq ($(findstring backend,$(subdir)), backend)
 override CPPFLAGS+= -DBUILDING_DLL=1
 endif