From 661a58cddba9fe31be8bd7350f868b80a7a0458d Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Thu, 5 Apr 2007 19:50:43 +0000 Subject: [PATCH] Make lists of source files for each app available individually - i.e. for creation of dynamically loadable modules. --- Makefile.include | 2 ++ apps/about/Makefile.about | 4 ++-- apps/calc/Makefile.calc | 4 ++-- apps/cmdd/Makefile.cmdd | 4 ++-- apps/dhcp/Makefile.dhcp | 4 ++-- apps/directory/Makefile.directory | 4 ++-- apps/editor/Makefile.editor | 4 ++-- apps/email/Makefile.email | 6 +++--- apps/ftp/Makefile.ftp | 4 ++-- apps/irc/Makefile.irc | 6 +++--- apps/netconf/Makefile.netconf | 4 ++-- apps/process-list/Makefile.process-list | 4 ++-- apps/program-handler/Makefile.program-handler | 4 ++-- apps/shell/Makefile.shell | 4 ++-- apps/telnet/Makefile.telnet | 4 ++-- apps/telnetd/Makefile.telnetd | 6 +++--- apps/vnc/Makefile.vnc | 4 ++-- apps/webbrowser/Makefile.webbrowser | 6 +++--- apps/webserver/Makefile.webserver | 6 +++--- 19 files changed, 43 insertions(+), 41 deletions(-) diff --git a/Makefile.include b/Makefile.include index 822c05a4e..f7d495402 100644 --- a/Makefile.include +++ b/Makefile.include @@ -62,6 +62,8 @@ ifdef APPS APPDIRS += $(addprefix $(CONTIKI)/apps/, $(APPS)) APPINCLUDES = $(foreach APP, $(APPS), $(CONTIKI)/apps/$(APP)/Makefile.$(APP)) -include $(APPINCLUDES) + APP_SOURCES = $(foreach APP, $(APPS), $($(APP)_src)) + DSC_SOURCES = $(foreach APP, $(APPS), $($(APP)_dsc)) CONTIKI_SOURCEFILES += $(APP_SOURCES) $(DSC_SOURCES) endif diff --git a/apps/about/Makefile.about b/apps/about/Makefile.about index dc13c3834..4b3309be7 100644 --- a/apps/about/Makefile.about +++ b/apps/about/Makefile.about @@ -1,2 +1,2 @@ -APP_SOURCES += about.c -DSC_SOURCES += about-dsc.c \ No newline at end of file +about_src = about.c +about_dsc = about-dsc.c diff --git a/apps/calc/Makefile.calc b/apps/calc/Makefile.calc index a0f343611..6c526e643 100644 --- a/apps/calc/Makefile.calc +++ b/apps/calc/Makefile.calc @@ -1,2 +1,2 @@ -APP_SOURCES += calc.c -DSC_SOURCES += calc-dsc.c \ No newline at end of file +calc_src += calc.c +calc_dsc += calc-dsc.c diff --git a/apps/cmdd/Makefile.cmdd b/apps/cmdd/Makefile.cmdd index 8b36f8e65..a4817f267 100644 --- a/apps/cmdd/Makefile.cmdd +++ b/apps/cmdd/Makefile.cmdd @@ -1,2 +1,2 @@ -APP_SOURCES += cmdd.c -DSC_SOURCES += \ No newline at end of file +cmdd_src = cmdd.c +cmdd_dsc = diff --git a/apps/dhcp/Makefile.dhcp b/apps/dhcp/Makefile.dhcp index b205fb160..8da2985de 100644 --- a/apps/dhcp/Makefile.dhcp +++ b/apps/dhcp/Makefile.dhcp @@ -1,2 +1,2 @@ -APP_SOURCES += dhcp.c dhcpc.c -DSC_SOURCES += dhcp-dsc.c \ No newline at end of file +dhcp_src = dhcp.c dhcpc.c +dhcp_dsc = dhcp-dsc.c diff --git a/apps/directory/Makefile.directory b/apps/directory/Makefile.directory index e74993f3f..15f74e57d 100644 --- a/apps/directory/Makefile.directory +++ b/apps/directory/Makefile.directory @@ -1,2 +1,2 @@ -APP_SOURCES += directory.c -DSC_SOURCES += directory-dsc.c \ No newline at end of file +directory_src = directory.c +directory_dsc = directory-dsc.c diff --git a/apps/editor/Makefile.editor b/apps/editor/Makefile.editor index 9a514acc4..c976cfe1e 100644 --- a/apps/editor/Makefile.editor +++ b/apps/editor/Makefile.editor @@ -1,2 +1,2 @@ -APP_SOURCES += editor.c memb.c ctk-filedialog.c -DSC_SOURCES += editor-dsc.c \ No newline at end of file +editor_src = editor.c memb.c ctk-filedialog.c +editor_dsc = editor-dsc.c diff --git a/apps/email/Makefile.email b/apps/email/Makefile.email index 4a0917e62..eaad4d696 100644 --- a/apps/email/Makefile.email +++ b/apps/email/Makefile.email @@ -1,3 +1,3 @@ -APP_SOURCES += email.c smtp-socket.c smtp-strings.c ctk-textentry-multiline.c \ - psock.c uipbuf.c memb.c -DSC_SOURCES += email-dsc.c \ No newline at end of file +email_src = email.c smtp-socket.c smtp-strings.c ctk-textentry-multiline.c \ + psock.c uipbuf.c memb.c +email_dsc = email-dsc.c diff --git a/apps/ftp/Makefile.ftp b/apps/ftp/Makefile.ftp index df796d7e7..341d3817d 100644 --- a/apps/ftp/Makefile.ftp +++ b/apps/ftp/Makefile.ftp @@ -1,2 +1,2 @@ -APP_SOURCES += ftp.c ftpc.c memb.c -DSC_SOURCES += ftp-dsc.c \ No newline at end of file +tfp_src = ftp.c ftpc.c memb.c +ftp_dsc = ftp-dsc.c diff --git a/apps/irc/Makefile.irc b/apps/irc/Makefile.irc index de23e03a8..e67f7557f 100644 --- a/apps/irc/Makefile.irc +++ b/apps/irc/Makefile.irc @@ -1,3 +1,3 @@ -APP_SOURCES += irc.c ircc.c psock.c uipbuf.c ircc-strings.c \ - ctk-textentry-cmdline.c -DSC_SOURCES += irc-dsc.c \ No newline at end of file +irc_src = irc.c ircc.c psock.c uipbuf.c ircc-strings.c \ + ctk-textentry-cmdline.c +irc_dsc = irc-dsc.c diff --git a/apps/netconf/Makefile.netconf b/apps/netconf/Makefile.netconf index 20e53a918..04091a348 100644 --- a/apps/netconf/Makefile.netconf +++ b/apps/netconf/Makefile.netconf @@ -1,2 +1,2 @@ -APP_SOURCES += netconf.c -DSC_SOURCES += netconf-dsc.c \ No newline at end of file +netconf_src = netconf.c +netconf_dsc = netconf-dsc.c diff --git a/apps/process-list/Makefile.process-list b/apps/process-list/Makefile.process-list index 6a84ea57b..8cda90963 100644 --- a/apps/process-list/Makefile.process-list +++ b/apps/process-list/Makefile.process-list @@ -1,2 +1,2 @@ -APP_SOURCES += process-list.c -DSC_SOURCES += process-list-dsc.c \ No newline at end of file +process-list_src = process-list.c +process-list_dsc = process-list-dsc.c diff --git a/apps/program-handler/Makefile.program-handler b/apps/program-handler/Makefile.program-handler index 2aa939769..81f69b00e 100644 --- a/apps/program-handler/Makefile.program-handler +++ b/apps/program-handler/Makefile.program-handler @@ -1,2 +1,2 @@ -APP_SOURCES += program-handler.c -DSC_SOURCES += \ No newline at end of file +program-handler_src = program-handler.c +program-handler_dsc = diff --git a/apps/shell/Makefile.shell b/apps/shell/Makefile.shell index bbbe64890..4642e3533 100644 --- a/apps/shell/Makefile.shell +++ b/apps/shell/Makefile.shell @@ -1,2 +1,2 @@ -APP_SOURCES += shell-gui.c shell.c ctk-textentry-cmdline.c -DSC_SOURCES += shell-dsc.c \ No newline at end of file +shell_src = shell-gui.c shell.c ctk-textentry-cmdline.c +shell_dsc = shell-dsc.c diff --git a/apps/telnet/Makefile.telnet b/apps/telnet/Makefile.telnet index 92ffd3a60..9ac353443 100644 --- a/apps/telnet/Makefile.telnet +++ b/apps/telnet/Makefile.telnet @@ -1,2 +1,2 @@ -APP_SOURCES += simpletelnet.c telnet.c -DSC_SOURCES += telnet-dsc.c \ No newline at end of file +telnet_src = simpletelnet.c telnet.c +telnet_dsc = telnet-dsc.c diff --git a/apps/telnetd/Makefile.telnetd b/apps/telnetd/Makefile.telnetd index 9ed3a39eb..ba10629b9 100644 --- a/apps/telnetd/Makefile.telnetd +++ b/apps/telnetd/Makefile.telnetd @@ -1,3 +1,3 @@ -APP_SOURCES += telnetd.c shell.c -DSC_SOURCES += telnetd-dsc.c -APPDIRS += $(CONTIKI)/apps/shell +telnetd_src = telnetd.c shell.c +telnetd_dsc = telnetd-dsc.c +APPDIRS += $(CONTIKI)/apps/shell diff --git a/apps/vnc/Makefile.vnc b/apps/vnc/Makefile.vnc index 15441e9d2..e950ef8f2 100644 --- a/apps/vnc/Makefile.vnc +++ b/apps/vnc/Makefile.vnc @@ -1,2 +1,2 @@ -APP_SOURCES += vnc.c vnc-viewer.c vnc-draw.c -DSC_SOURCES += vnc-dsc.c \ No newline at end of file +vnc_src = vnc.c vnc-viewer.c vnc-draw.c +vnc_dsc = vnc-dsc.c diff --git a/apps/webbrowser/Makefile.webbrowser b/apps/webbrowser/Makefile.webbrowser index c5c0e2413..5c4efc44d 100644 --- a/apps/webbrowser/Makefile.webbrowser +++ b/apps/webbrowser/Makefile.webbrowser @@ -1,3 +1,3 @@ -APP_SOURCES += www.c webclient.c http-strings.c http-user-agent-string.c \ - htmlparser.c html-strings.c arg.c -DSC_SOURCES += www-dsc.c +webbrowser_src = www.c webclient.c http-strings.c http-user-agent-string.c \ + htmlparser.c html-strings.c arg.c +webbrowser_dsc = www-dsc.c diff --git a/apps/webserver/Makefile.webserver b/apps/webserver/Makefile.webserver index d55bfa520..c45c8e04d 100644 --- a/apps/webserver/Makefile.webserver +++ b/apps/webserver/Makefile.webserver @@ -1,6 +1,6 @@ -APP_SOURCES += webserver-nogui.c httpd.c http-strings.c psock.c uipbuf.c \ - memb.c httpd-fs.c httpd-cgi.c -DSC_SOURCES += webserver-dsc.c +webserver_src = webserver-nogui.c httpd.c http-strings.c psock.c uipbuf.c \ + memb.c httpd-fs.c httpd-cgi.c +webserver_dsc = webserver-dsc.c #$(CONTIKI)/apps/webserver/http-strings.c: $(CONTIKI)/apps/webserver/http-strings # cd $(CONTIKI)/apps/webserver/; $(CONTIKI)/tools/makestrings $<