Fixed for clean Cygwin link; move netutils strings into common library
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@352 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
parent
3b044c3bbd
commit
d47d9748a5
|
@ -211,7 +211,10 @@ $(BIN): context depend $(LINKLIBS)
|
|||
$(MAKE) -C $(ARCH_SRC) TOPDIR=$(TOPDIR) LINKLIBS="$(LINKLIBS)" $(BIN)
|
||||
|
||||
depend:
|
||||
@for dir in $(MAKEDIRS) ; do \
|
||||
echo "CLEANDIRS: $(CLEANDIRS)"
|
||||
echo "MAKEDIRS: $(MAKEDIRS)"
|
||||
for dir in $(MAKEDIRS) ; do \
|
||||
echo "-- DEPS in $$dir --" ; \
|
||||
$(MAKE) -C $$dir TOPDIR=$(TOPDIR) depend ; \
|
||||
done
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
############################################################
|
||||
############################################################################
|
||||
# Makefile
|
||||
#
|
||||
# Copyright (C) 2007 Gregory Nutt. All rights reserved.
|
||||
|
@ -31,7 +31,7 @@
|
|||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
# POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
############################################################
|
||||
############################################################################
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
|
||||
|
@ -45,14 +45,15 @@ include smtp/Make.defs
|
|||
include telnetd/Make.defs
|
||||
include webclient/Make.defs
|
||||
include webserver/Make.defs
|
||||
include Make.str
|
||||
endif
|
||||
|
||||
ASRCS = $(UIPLIB_ASRCS) $(DHCPC_ASRCS) $(RESOLV_ASRCS) $(SMTP_ASRCS) \
|
||||
$(TELNETD_ASRCS) $(WEBCLIENT_ASRCS) $(WEBSERVER_ASRCS)
|
||||
$(TELNETD_ASRCS) $(WEBCLIENT_ASRCS) $(WEBSERVER_ASRCS) $(STRNG_ASRCS)
|
||||
AOBJS = $(ASRCS:.S=$(OBJEXT))
|
||||
|
||||
CSRCS = $(UIPLIB_CSRCS) $(DHCPC_CSRCS) $(RESOLV_CSRCS) $(SMTP_CSRCS) \
|
||||
$(TELNETD_CSRCS) $(WEBCLIENT_CSRCS) $(WEBSERVER_CSRCS)
|
||||
$(TELNETD_CSRCS) $(WEBCLIENT_CSRCS) $(WEBSERVER_CSRCS) $(STRNG_CSRCS)
|
||||
COBJS = $(CSRCS:.c=$(OBJEXT))
|
||||
|
||||
SRCS = $(ASRCS) $(CSRCS)
|
||||
|
@ -76,15 +77,24 @@ $(BIN): $(OBJS)
|
|||
{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
|
||||
done ; )
|
||||
|
||||
makestrings$(EXEEXT): uiplib/makestrings.c
|
||||
gcc -O2 -Wall -o makestrings$(EXEEXT) uiplib/makestrings.c
|
||||
|
||||
.strings: makestrings$(EXEEXT) uiplib/netutil-strings
|
||||
./makestrings uiplib/netutil-strings
|
||||
|
||||
Make.str: makestrings$(EXEEXT) uiplib/netutil-strings
|
||||
./makestrings -s uiplib/netutil-strings >Make.str
|
||||
|
||||
.depend: Makefile $(SRCS)
|
||||
ifeq ($(CONFIG_NET),y)
|
||||
$(MKDEP) --dep-path uiplib --dep-path dhcpc --dep-path smtp --dep-path webclient \
|
||||
$(MKDEP) --dep-path . --dep-path uiplib --dep-path dhcpc --dep-path smtp --dep-path webclient \
|
||||
--dep-path resolv --dep-path telnetd --dep-path webserver \
|
||||
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
|
||||
endif
|
||||
touch $@
|
||||
|
||||
depend: .depend
|
||||
depend: .strings Make.str .depend
|
||||
|
||||
clean:
|
||||
rm -f $(BIN) *.o *.rel *.asm *.lst *.sym *.adb *~
|
||||
|
@ -93,5 +103,7 @@ clean:
|
|||
|
||||
distclean: clean
|
||||
rm -f Make.dep .depend
|
||||
rm -f $(STRNG_CSRCS) $(STRNG_ASRCS)
|
||||
rm -f Make.str netutil-strings.h makestrings$(EXEEXT)
|
||||
|
||||
-include Make.dep
|
||||
|
|
|
@ -34,4 +34,4 @@
|
|||
############################################################################
|
||||
|
||||
SMTP_ASRCS =
|
||||
SMTP_CSRCS = smtp.c smtp-strings.c
|
||||
SMTP_CSRCS = smtp.c
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
#include <net/uip/uip.h>
|
||||
#include <net/uip/smtp.h>
|
||||
|
||||
#include "smtp-strings.h"
|
||||
#include "netutil-strings.h"
|
||||
|
||||
#define SMTP_INPUT_BUFFER_SIZE 512
|
||||
|
||||
|
|
Loading…
Reference in New Issue