From 3b7c27b9e958da97ebfe715df7dcfbc67abcd622 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Sat, 21 Apr 2007 15:11:21 +0000 Subject: [PATCH] Use generally lowercase names for functin variables. --- platform/win32/Makefile | 6 +++--- platform/win32/Makefile.win32 | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/win32/Makefile b/platform/win32/Makefile index 93383868e..05469a747 100644 --- a/platform/win32/Makefile +++ b/platform/win32/Makefile @@ -29,7 +29,7 @@ # # Author: Oliver Schmidt # -# $Id: Makefile,v 1.3 2007/04/13 21:55:55 oliverschmidt Exp $ +# $Id: Makefile,v 1.4 2007/04/21 15:11:21 oliverschmidt Exp $ # PRGS = about calc dhcp directory email ftp irc netconf processes shell \ @@ -38,7 +38,7 @@ DSCS = about calc dhcp email ftp irc netconf processes shell telnet \ telnetd webserver all: contiki-main $(PRGS:=.prg) $(DSCS:=.dsc) -APPNAME = ${subst processes,process-list,${subst www,webbrowser,$(1)}} +appname = ${subst processes,process-list,${subst www,webbrowser,$(1)}} # Add telnetd-gui.c to get CTK support override telnetd_src = telnetd.c telnetd-gui.c memb.c shell.c @@ -48,6 +48,6 @@ override webserver_src = webserver.c httpd.c http-strings.c psock.c \ uipbuf.c memb.c httpd-fs.c httpd-cgi.c CONTIKI = ../.. -APPS = program-handler ${call APPNAME,$(PRGS)} +APPS = program-handler ${call appname,$(PRGS)} TARGET = win32 -include $(CONTIKI)/Makefile.include diff --git a/platform/win32/Makefile.win32 b/platform/win32/Makefile.win32 index 0f64be04a..5a29a6490 100644 --- a/platform/win32/Makefile.win32 +++ b/platform/win32/Makefile.win32 @@ -29,7 +29,7 @@ # # Author: Oliver Schmidt # -# $Id: Makefile.win32,v 1.5 2007/04/15 13:30:16 oliverschmidt Exp $ +# $Id: Makefile.win32,v 1.6 2007/04/21 15:11:21 oliverschmidt Exp $ # ifndef CONTIKI @@ -58,19 +58,19 @@ LDFLAGS += -Wl,--out-implib=contiki-main.$(TARGET).a \ -u _cfs_find_service -u _uiplib_ipaddrconv ### Generate the module-link prerequisites -define PRG_TEMPLATE +define prg_template $(1).prg: $${addprefix $$(OBJECTDIR)/,$$($(2)_src:.c=.o)} endef -define DSC_TEMPLATE +define dsc_template $(1).dsc: $${addprefix $$(OBJECTDIR)/,$$($(2)_dsc:.c=.o)} endef -${foreach PRG,$(PRGS),${eval ${call PRG_TEMPLATE,$(PRG),${call APPNAME,$(PRG)}}}} -${foreach DSC,$(DSCS),${eval ${call DSC_TEMPLATE,$(DSC),${call APPNAME,$(DSC)}}}} +${foreach PRG,$(PRGS),${eval ${call prg_template,$(PRG),${call appname,$(PRG)}}}} +${foreach DSC,$(DSCS),${eval ${call dsc_template,$(DSC),${call appname,$(DSC)}}}} ### Generic module-compile and -link rules, no prerequisites here ### (The *.d files contain the full module-compile prerequisites) ${sort ${foreach PRG,$(PRGS), ${addprefix $(OBJECTDIR)/, \ - $(${call APPNAME,$(PRG)_src:.c=.o})}}}: + $(${call appname,$(PRG)_src:.c=.o})}}}: $(CC) $(CFLAGS) -DAUTOSTART_ENABLE -D_USRDLL -DPROCESS_LOADABLE -c $< -o $@ $(PRGS:=.prg): $(LD) -shared $^ contiki-main.$(TARGET).a -o $@