diff --git a/src/smblib/GNUmakefile b/src/smblib/GNUmakefile index 320af6dd759438a4fc5c1c2b2509d601a17c5915..130406c04db6af0cb3e53951a608f15a264c46fa 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 c5c1402a2c727f4498ed65e30b0ce7d352a11960..4aa930e198fb09d5276900ea2d02945667409980 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 f1111feb352767564af3d77f5404e97036ba30ab..610b55e6916f59d8bbe0e936355cca14cb466231 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)