Cosmetic cleanups of Beos port

5 files changed, 14 insertions, 22 deletions

diff --git a/src/backend/port/Makefile.in b/src/backend/port/Makefile.in
index eb976af02ac..44b0a7ee9b0 100644
--- a/src/backend/port/Makefile.in
+++ b/src/backend/port/Makefile.in
@@ -13,7 +13,7 @@
 # be converted to Method 2.  
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.25 2000/10/07 14:39:10 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/backend/port/Attic/Makefile.in,v 1.26 2000/10/09 16:42:53 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -40,7 +40,9 @@ qnx4/SUBSYS.o: qnx4.dir
 qnx4.dir:
 	$(MAKE) -C qnx4 all
 
-beos/SUBSYS.o:
+beos/SUBSYS.o: beos.dir
+
+beos.dir:
 	$(MAKE) -C beos all
 
 tas.o: tas.s
diff --git a/src/backend/port/beos/Makefile b/src/backend/port/beos/Makefile
index 92e11253d14..26c72662cdc 100644
--- a/src/backend/port/beos/Makefile
+++ b/src/backend/port/beos/Makefile
@@ -1,26 +1,18 @@
-#-------------------------------------------------------------------------
-#
-# Makefile--
-#    Makefile for port/beos
-#
-#-------------------------------------------------------------------------
+# $Header: /cvsroot/pgsql/src/backend/port/beos/Attic/Makefile,v 1.2 2000/10/09 16:42:54 petere Exp $
 
+subdir = src/backend/port/beos
 top_builddir = ../../../..
-include ../../../Makefile.global
-
-INCLUDE_OPT = 
-
-CFLAGS+=$(INCLUDE_OPT)
+include $(top_builddir)/src/Makefile.global
 
 OBJS = sem.o shm.o support.o
 
 all: SUBSYS.o 
 
 SUBSYS.o: $(OBJS)
-	$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
+	$(LD) $(LDREL) $(LDOUT) $@ $^
 
 depend dep:
-	$(CC) -MM $(INCLUDE_OPT) *.c >depend
+	$(CC) -MM $(CFLAGS) $(CPPFLAGS) *.c >depend
 
 clean: 
 	rm -f SUBSYS.o $(OBJS) 
@@ -28,4 +20,3 @@ clean:
 ifeq (depend,$(wildcard depend))
 include depend
 endif
-
diff --git a/src/backend/port/beos/sem.c b/src/backend/port/beos/sem.c
index b67cf82f38b..17472759f02 100644
--- a/src/backend/port/beos/sem.c
+++ b/src/backend/port/beos/sem.c
@@ -10,9 +10,9 @@
 
 
 #include "postgres.h"
-#include "stdio.h"
-#include "errno.h"
-#include "OS.h"
+#include <stdio.h>
+#include <errno.h>
+#include <OS.h>
 
 // Controle d'un pool de sémaphores
 // On considere que le semId utilisé correspond bien a une area de notre adress space
diff --git a/src/backend/port/beos/shm.c b/src/backend/port/beos/shm.c
index 91e6756b738..1611d204f92 100644
--- a/src/backend/port/beos/shm.c
+++ b/src/backend/port/beos/shm.c
@@ -9,8 +9,8 @@
  */
 
 #include "postgres.h"
-#include "stdio.h"
-#include "OS.h"
+#include <stdio.h>
+#include <OS.h>
 
 // Detachement d'une zone de mémoire partagée
 // On detruit le clone de l'area dans notre adress-space
diff --git a/src/makefiles/Makefile.beos b/src/makefiles/Makefile.beos
index bc8e9124626..dd171c53555 100644
--- a/src/makefiles/Makefile.beos
+++ b/src/makefiles/Makefile.beos
@@ -1,7 +1,6 @@
 MK_NO_LORDER=true
 ifdef ELF_SYSTEM
 export_dynamic = -Wl,-E
-CPPFLAGS+= -I$(top_srcdir)/src/backend/port/beos
 endif
 %.so: %.o
 	ln -fs $(top_srcdir)/src/backend/postgres _APP_