New Build System

xtrn/sbj/GNUmakefile

@@ -12,57 +12,21 @@
 
 # $Id$
 
-# Macros
-CC		=	gcc
-LD		=	ld
 XSDK		=	../sdk
-
-vpath %.c $(XPDEV) $(XSDK)
-
-ifndef os
- os              =       $(shell uname)
- $(warning OS not specified on command line, setting to '$(os)'.)
-endif
-os      :=	$(shell echo $(os) | tr "[A-Z]" "[a-z]")
-# remove '/' from "os/2"
-os      :=  $(shell echo $(os) | tr -d "/")
-
-
-LIBDIR	:=	/usr/lib
-DELETE	:=	rm -f -v
-ifeq ($(os),freebsd)	# FreeBSD
- LIBS	+=	-pthread
-else
- ifeq ($(os),openbsd)	# OpenBSD
-  LIBS	+=	-pthread
- else
-  ifeq ($(os),netbsd)	#NetBSD
-   CFLAGS	+=	-D__unix__ -I/usr/pkg/include -I../../src/xpdev
-   LIBS	+=	-L/usr/pkg/lib -lpthread
-  else
-   ifeq ($(os),qnx)	# QNX
-    LIBS	+=	-lsocket
-   else					# Linux / Generic UNIX
-    LIBS	+=	-lpthread
-   endif
-  endif #! QNX
- endif	#! OpenBSD
-endif	#! FreeBSD
-
+XPDEV	?=	../../src/xpdev/
+vpath %.c $(XSDK)
+NEED_THREADS	:=	1
+include $(XPDEV)Common.gmake
 CFLAGS	+=	-I$(XSDK)
 
-OBJS		= xsdk.o xsdkvars.o xsdkwrap.o
-ifeq ($(os),netbsd)
- OBJS	+=	sem.o
-endif
-
-all: sbj sbjclean
-
-sbj: sbj.o $(OBJS)
-	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
-
-sbjclean: sbjclean.o $(OBJS)
-	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
+$(EXEODIR)$(SLASH)sbj: $(LIBODIR)$(SLASH)sbj.o $(OBJS)
+   ifndef bcc
+	@echo Linking $@
+   endif
+	$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
 
-clean:
-	rm -f sbj sbjclean *.o
+$(EXEODIR)$(SLASH)sbjclean: $(LIBODIR)$(SLASH)sbjclean.o $(OBJS)
+   ifndef bcc
+	@echo Linking $@
+   endif
+	$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)

xtrn/sbl/GNUmakefile

@@ -13,71 +13,26 @@
 # $Id$
 
 # Macros
-CC		=	gcc
-LD		=	ld
 XSDK		=	../sdk
 ifndef XPDEV
- XPDEV		=	../../src/xpdev
+ XPDEV		=	../../src/xpdev/
 endif
-ifndef SBBS_SRC
- SBBS_SRC	=	../../src/sbbs3
-endif
-
-vpath %.c $(XPDEV) $(XSDK) $(SBBS_SRC)
-
-ifndef os
- os              =       $(shell uname)
- $(warning OS not specified on command line, setting to '$(os)'.)
-endif
-os      :=	$(shell echo $(os) | tr "[A-Z]" "[a-z]")
-# remove '/' from "os/2"
-os      :=  $(shell echo $(os) | tr -d "/")
-
-LIBDIR	:=	/usr/lib
-DELETE	:=	rm -f -v
-ifeq ($(os),freebsd)	# FreeBSD
- CFLAGS	+= -D_THREAD_SAFE
- LFLAGS	:=	-pthread
- BSD	=	1
-else
- ifeq ($(os),openbsd)	# OpenBSD
-  CFLAGS	+= -D_THREAD_SAFE
-  LFLAGS	:=	-pthread
-  BSD		=	1
- else
-  ifeq ($(os),netbsd)	# NetBSD
-  CFLAGS	+= -D_THREAD_SAFE -D__unix__ -D_NEED_SEM -I/usr/pkg/include
-  LFLAGS	:=	-lpth -lpthread -L/usr/pkg/lib
-  else
-   ifeq ($(os),qnx)	# QNX
-    CFLAGS	+= -D_THREAD_SAFE
-    LFLAGS	:= 
-   else			# Linux / Other UNIX
-    ifdef bcc
-     LFLAGS	:=	libpthread.a
-    else
-     LFLAGS	:=	-lpthread
-    endif
-   endif
-  endif
- endif
-endif
-
-
-CFLAGS	+=	-I$(XSDK) -I$(XPDEV) -I$(SBBS_SRC)
-
-all: sbl sbl2smb smb2sbl sblpack
+SBBS_SRC	:=	$(XPDEV)../sbbs3/
+NEED_THREADS	:=	1
+include $(XPDEV)Common.gmake
 
-sbl: sbl.o xsdk.o xsdkvars.o xsdkwrap.o
-	$(CC) $(CFLAGS) $(LFLAGS) $^ -o $@ $(LIBS)
+vpath %.c $(XSDK)
 
-SMBIO	=	genwrap.o filewrap.o dirwrap.o smblib.o lzh.o
+CFLAGS	+=	-I$(XSDK)
 
-sbl2smb: sbl2smb.o $(SMBIO)
+$(EXEODIR)$(SLASH)sbl: $(OBJS)
+	@echo Linking $@
+	$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
+SMBIO	=	$(LIBODIR)/genwrap.o $(LIBODIR)/filewrap.o $(LIBODIR)/dirwrap.o \
+		$(LIBODIR)/smblib.o $(LIBODIR)/lzh.o
 
-smb2sbl: smb2sbl.o $(SMBIO)
+$(EXEODIR)$(SLASH)sbl2smb: $(LIBODIR)$(SLASH)sbl2smb.o $(SMBIO)
 
-sblpack: sblpack.o filewrap.o
+$(EXEODIR)$(SLASH)smb2sbl: $(LIBODIR)$(SLASH)smb2sbl.o $(SMBIO)
 
-clean:
-	rm -f sbl sbl2smb smb2sbl sblpack *.o
+$(EXEODIR)$(SLASH)sblpack: $(LIBODIR)$(SLASH)sblpack.o $(LIBODIR)$(SLASH)/filewrap.o