New make system!

src/sbbs3/uedit/GNUmakefile

@@ -13,28 +13,18 @@
 
 # $Id$
 
-#USE_CURSES	:=	1	#Use old curses UIFC implementation
-USE_UIFC32	:=	1	# Use new uifc32 implementation
-
-XPDEV	=	../../xpdev/
-SBBS_SRC	=   ../
-UIFC_SRC	= ../../uifc/
-NEED_UIFC	:=	1
-include $(XPDEV)Common.gmake
-include $(SBBS_SRC)Common.gmake
-include $(UIFC_SRC)Common.gmake
+SRC_ROOT	=	../..
+include $(SRC_ROOT)/build/Common.gmake
 
 ifeq ($(os),sunos)
  LDFLAGS	+=	-lnsl
 endif
 
-ifeq ($(os),netbsd)
- CFLAGS		+=	$(PTHREAD_CFLAGS)
- LDFLAGS	+=	$(PTHREAD_LDFLAGS)
-endif
+vpath %.c ..
 
-FORCE$(EXEODIR)/uedit: $(EXEODIR) $(OBJS) $(BUILD_DEPENDS)
+CFLAGS	+=	-I.. $(SMBLIB_CFLAGS) $(UIFC-MT_CFLAGS) $(CIOLIB-MT_CFLAGS) $(XPDEV-MT_CFLAGS) 
+LDFLAGS	+=	$(SMBLIB_LDFLAGS) $(UIFC-MT_LDFLAGS) $(CIOLIB-MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(MT_LDFLAGS)
 
-$(EXEODIR)/uedit: $(EXEODIR) $(OBJS) $(BUILD_DEPENDS)
+$(UEDIT): $(OBJS)
 	@echo Linking $@
-	${QUIET}$(CC) $(LDFLAGS) $(OBJS) -o $@
+	${QUIET}$(CC) $(LDFLAGS) $(OBJS) -o $@ $(SMBLIB_LIBS) $(UIFC-MT_LIBS) $(CIOLIB-MT_LIBS) $(XPDEV-MT_LIBS)

src/sbbs3/uedit/objects.mk

-OBJS	:=	$(LIBODIR)/filewrap.o \
-			$(LIBODIR)/dirwrap.o \
-			$(LIBODIR)/genwrap.o \
-			$(LIBODIR)/sbbs_ini.o \
-			$(LIBODIR)/ini_file.o \
-			$(LIBODIR)/str_list.o \
-			$(LIBODIR)/scfglib1.o \
-			$(LIBODIR)/scfglib2.o \
-			$(LIBODIR)/nopen.o \
-			$(LIBODIR)/userdat.o \
-			$(LIBODIR)/ars.o \
-			$(LIBODIR)/dat_rec.o \
-			$(LIBODIR)/str_util.o \
-			$(LIBODIR)/crc16.o \
-			$(LIBODIR)/load_cfg.o \
-			$(LIBODIR)/date_str.o \
-			$(LIBODIR)/smblib.o \
-			$(LIBODIR)/getstats.o \
-			$(LIBODIR)/getmail.o \
-			$(LIBODIR)/uedit.o
+OBJS	=	\
+			$(MTOBJODIR)$(DIRSEP)ars$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)dat_rec$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)date_str$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)getmail$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)getstats$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)load_cfg$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)nopen$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)sbbs_ini$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)scfglib1$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)scfglib2$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)str_util$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)uedit$(OFILE) \
+			$(MTOBJODIR)$(DIRSEP)userdat$(OFILE)

src/sbbs3/uedit/targets.mk

-all: $(LIBODIR) $(BUILD_DEPENDS)$(EXEODIR)/uedit
+UEDIT	=	$(EXEODIR)$(DIRSEP)uedit$(EXEFILE)
+
+all: $(MTOBJODIR) $(EXEODIR) $(UEDIT)