From 48880f08a928dd924c3b833866a94f8fb097b497 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Fri, 17 Sep 2004 04:40:55 +0000
Subject: [PATCH] Fix library depends (This was fixed a while ago, but I forgot
to commit it!)
---
src/smblib/GNUmakefile | 8 +-------
src/smblib/Makefile | 4 ++--
src/smblib/targets.mk | 5 ++++-
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/smblib/GNUmakefile b/src/smblib/GNUmakefile
index 320af6dd75..130406c04d 100644
--- a/src/smblib/GNUmakefile
+++ b/src/smblib/GNUmakefile
@@ -21,14 +21,8 @@ CFLAGS += -I$(XPDEV_SRC)
# SMBLIB Library Link Rule
-$(SMBLIB): $(OBJODIR) $(OBJS)
+$(SMBLIB_BUILD): $(OBJODIR) $(OBJS)
@echo Creating $@ ...
$(QUIET)ar rc $@ $(OBJS)
$(QUIET)ranlib $@
-# SMBLIB Library Link Rule
-$(SMBLIB-MT): $(MTOBJODIR) $(MTOBJS)
- @echo Creating $@ ...
- $(QUIET)ar rc $@ $(MTOBJS)
- $(QUIET)ranlib $@
-
diff --git a/src/smblib/Makefile b/src/smblib/Makefile
index c5c1402a2c..4aa930e198 100644
--- a/src/smblib/Makefile
+++ b/src/smblib/Makefile
@@ -21,10 +21,10 @@ SRC_ROOT = ..
# Cross platform/compiler definitions
!include ..\build\Common.bmake # defines clean and output directory rules
-CFLAGS = $(CFLAGS) -I$(XPDEV_SRC)
+CFLAGS = $(CFLAGS) -I$(XPDEV_SRC) -DWRAPPER_IMPORTS -DSMB_IMPORTS
# SBBS DLL Link Rule
-$(SMBLIB): $(OBJS)
+$(SMBLIB_BUILD): $(OBJS)
@echo Creating $< ...
-$(QUIET)$(DELETE) $@
&$(QUIET)tlib $@ +$**
diff --git a/src/smblib/targets.mk b/src/smblib/targets.mk
index f1111feb35..610b55e691 100644
--- a/src/smblib/targets.mk
+++ b/src/smblib/targets.mk
@@ -1,2 +1,5 @@
# smblib/targets.mk
-lib: $(OBJODIR) $(LIBODIR) $(SMBLIB)
\ No newline at end of file
+
+SMBLIB_BUILD = $(LIBODIR)$(DIRSEP)$(LIBPREFIX)smb$(LIBFILE)
+
+lib: $(OBJODIR) $(LIBODIR) $(SMBLIB_BUILD)
--
GitLab