Skip to content
Snippets Groups Projects
Commit 65698f88 authored by deuce's avatar deuce
Browse files

More hackery... build now fails on multiple definiations of `wday' and `mon'

*sigh*

I'm going to bed.
parent b6e3f439
No related branches found
No related tags found
No related merge requests found
...@@ -255,6 +255,7 @@ CHKSMB_OBJS = \ ...@@ -255,6 +255,7 @@ CHKSMB_OBJS = \
$(LIBODIR)/smbdump.o \ $(LIBODIR)/smbdump.o \
$(LIBODIR)/conwrap.o \ $(LIBODIR)/conwrap.o \
$(LIBODIR)/dirwrap.o \ $(LIBODIR)/dirwrap.o \
$(LIBODIR)/filewrap.o \
$(LIBODIR)/genwrap.o $(LIBODIR)/genwrap.o
FORCE$(CHKSMB): $(CHKSMB_OBJS) FORCE$(CHKSMB): $(CHKSMB_OBJS)
...@@ -267,6 +268,7 @@ SMBUTIL_OBJS = \ ...@@ -267,6 +268,7 @@ SMBUTIL_OBJS = \
$(LIBODIR)/smbutil.o \ $(LIBODIR)/smbutil.o \
$(LIBODIR)/conwrap.o \ $(LIBODIR)/conwrap.o \
$(LIBODIR)/dirwrap.o \ $(LIBODIR)/dirwrap.o \
$(LIBODIR)/filewrap.o \
$(LIBODIR)/genwrap.o \ $(LIBODIR)/genwrap.o \
$(LIBODIR)/date_str.o \ $(LIBODIR)/date_str.o \
$(LIBODIR)/str_util.o $(LIBODIR)/str_util.o
...@@ -409,3 +411,6 @@ $(ASC2ANS): $(LIBODIR)/asc2ans.o ...@@ -409,3 +411,6 @@ $(ASC2ANS): $(LIBODIR)/asc2ans.o
$(QUIET)$(CC) $(UTIL_LDFLAGS) -o $@ $^ $(ADD_LIBS) $(QUIET)$(CC) $(UTIL_LDFLAGS) -o $@ $^ $(ADD_LIBS)
FORCE: FORCE:
SMBLIB: $(SMBLIB_TARGET)
...@@ -34,11 +34,11 @@ UTILS = $(BUILD_DEPENDS)$(FIXSMB) $(BUILD_DEPENDS)$(CHKSMB) \ ...@@ -34,11 +34,11 @@ UTILS = $(BUILD_DEPENDS)$(FIXSMB) $(BUILD_DEPENDS)$(CHKSMB) \
$(BUILD_DEPENDS)$(ANS2ASC) $(BUILD_DEPENDS)$(ASC2ANS) \ $(BUILD_DEPENDS)$(ANS2ASC) $(BUILD_DEPENDS)$(ASC2ANS) \
$(BUILD_DEPENDS)$(JSEXEC) $(BUILD_DEPENDS)$(JSEXEC)
all: $(LIBODIR) $(EXEODIR) $(SBBSMONO) $(UTILS) $(SBBSCON) all: SMBLIB $(LIBODIR) $(EXEODIR) $(SBBSMONO) $(UTILS) $(SBBSCON)
utils: $(EXEODIR) $(UTILS) utils: SMBLIB $(EXEODIR) $(UTILS)
dlls: $(LIBODIR) \ dlls: SMBLIB $(LIBODIR) \
$(SBBS) $(FTPSRVR) $(MAILSRVR) $(SERVICES) $(SBBS) $(FTPSRVR) $(MAILSRVR) $(SERVICES)
mono: $(LIBODIR) $(EXEODIR) $(SBBSMONO) mono: SMBLIB $(LIBODIR) $(EXEODIR) $(SBBSMONO)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment