From 3dd5bd7a37838610cb4cbcde4b89060e896dc278 Mon Sep 17 00:00:00 2001 From: Matthias Kovatsch Date: Wed, 18 Dec 2013 20:26:20 +0100 Subject: [PATCH] Renamed erbium to er-coap to avoid confusion and have a meaningful directory name. --- apps/er-coap/Makefile.er-coap | 4 ++++ apps/{erbium => er-coap}/er-coap-conf.h | 0 apps/{erbium => er-coap}/er-coap-constants.h | 0 apps/{erbium => er-coap}/er-coap-engine.c | 0 apps/{erbium => er-coap}/er-coap-engine.h | 0 apps/{erbium => er-coap}/er-coap-observe.c | 0 apps/{erbium => er-coap}/er-coap-observe.h | 0 apps/{erbium => er-coap}/er-coap-res-well-known-core.c | 0 apps/{erbium => er-coap}/er-coap-separate.c | 0 apps/{erbium => er-coap}/er-coap-separate.h | 0 apps/{erbium => er-coap}/er-coap-transactions.c | 0 apps/{erbium => er-coap}/er-coap-transactions.h | 0 apps/{erbium => er-coap}/er-coap.c | 0 apps/{erbium => er-coap}/er-coap.h | 0 apps/erbium/Makefile.erbium | 4 ---- examples/er-rest-example/Makefile | 2 +- 16 files changed, 5 insertions(+), 5 deletions(-) create mode 100755 apps/er-coap/Makefile.er-coap rename apps/{erbium => er-coap}/er-coap-conf.h (100%) rename apps/{erbium => er-coap}/er-coap-constants.h (100%) rename apps/{erbium => er-coap}/er-coap-engine.c (100%) rename apps/{erbium => er-coap}/er-coap-engine.h (100%) rename apps/{erbium => er-coap}/er-coap-observe.c (100%) rename apps/{erbium => er-coap}/er-coap-observe.h (100%) rename apps/{erbium => er-coap}/er-coap-res-well-known-core.c (100%) rename apps/{erbium => er-coap}/er-coap-separate.c (100%) rename apps/{erbium => er-coap}/er-coap-separate.h (100%) rename apps/{erbium => er-coap}/er-coap-transactions.c (100%) rename apps/{erbium => er-coap}/er-coap-transactions.h (100%) rename apps/{erbium => er-coap}/er-coap.c (100%) rename apps/{erbium => er-coap}/er-coap.h (100%) delete mode 100755 apps/erbium/Makefile.erbium diff --git a/apps/er-coap/Makefile.er-coap b/apps/er-coap/Makefile.er-coap new file mode 100755 index 000000000..8d467793b --- /dev/null +++ b/apps/er-coap/Makefile.er-coap @@ -0,0 +1,4 @@ +er-coap_src = er-coap.c er-coap-engine.c er-coap-transactions.c er-coap-observe.c er-coap-separate.c er-coap-res-well-known-core.c + +# Erbium will implement the REST Engine +CFLAGS += -DREST=coap_rest_implementation diff --git a/apps/erbium/er-coap-conf.h b/apps/er-coap/er-coap-conf.h similarity index 100% rename from apps/erbium/er-coap-conf.h rename to apps/er-coap/er-coap-conf.h diff --git a/apps/erbium/er-coap-constants.h b/apps/er-coap/er-coap-constants.h similarity index 100% rename from apps/erbium/er-coap-constants.h rename to apps/er-coap/er-coap-constants.h diff --git a/apps/erbium/er-coap-engine.c b/apps/er-coap/er-coap-engine.c similarity index 100% rename from apps/erbium/er-coap-engine.c rename to apps/er-coap/er-coap-engine.c diff --git a/apps/erbium/er-coap-engine.h b/apps/er-coap/er-coap-engine.h similarity index 100% rename from apps/erbium/er-coap-engine.h rename to apps/er-coap/er-coap-engine.h diff --git a/apps/erbium/er-coap-observe.c b/apps/er-coap/er-coap-observe.c similarity index 100% rename from apps/erbium/er-coap-observe.c rename to apps/er-coap/er-coap-observe.c diff --git a/apps/erbium/er-coap-observe.h b/apps/er-coap/er-coap-observe.h similarity index 100% rename from apps/erbium/er-coap-observe.h rename to apps/er-coap/er-coap-observe.h diff --git a/apps/erbium/er-coap-res-well-known-core.c b/apps/er-coap/er-coap-res-well-known-core.c similarity index 100% rename from apps/erbium/er-coap-res-well-known-core.c rename to apps/er-coap/er-coap-res-well-known-core.c diff --git a/apps/erbium/er-coap-separate.c b/apps/er-coap/er-coap-separate.c similarity index 100% rename from apps/erbium/er-coap-separate.c rename to apps/er-coap/er-coap-separate.c diff --git a/apps/erbium/er-coap-separate.h b/apps/er-coap/er-coap-separate.h similarity index 100% rename from apps/erbium/er-coap-separate.h rename to apps/er-coap/er-coap-separate.h diff --git a/apps/erbium/er-coap-transactions.c b/apps/er-coap/er-coap-transactions.c similarity index 100% rename from apps/erbium/er-coap-transactions.c rename to apps/er-coap/er-coap-transactions.c diff --git a/apps/erbium/er-coap-transactions.h b/apps/er-coap/er-coap-transactions.h similarity index 100% rename from apps/erbium/er-coap-transactions.h rename to apps/er-coap/er-coap-transactions.h diff --git a/apps/erbium/er-coap.c b/apps/er-coap/er-coap.c similarity index 100% rename from apps/erbium/er-coap.c rename to apps/er-coap/er-coap.c diff --git a/apps/erbium/er-coap.h b/apps/er-coap/er-coap.h similarity index 100% rename from apps/erbium/er-coap.h rename to apps/er-coap/er-coap.h diff --git a/apps/erbium/Makefile.erbium b/apps/erbium/Makefile.erbium deleted file mode 100755 index ef6a586c9..000000000 --- a/apps/erbium/Makefile.erbium +++ /dev/null @@ -1,4 +0,0 @@ -erbium_src = er-coap.c er-coap-engine.c er-coap-transactions.c er-coap-observe.c er-coap-separate.c er-coap-res-well-known-core.c - -# Erbium will implement the REST Engine -CFLAGS += -DREST=coap_rest_implementation diff --git a/examples/er-rest-example/Makefile b/examples/er-rest-example/Makefile index 7ef1f4ebc..348102789 100755 --- a/examples/er-rest-example/Makefile +++ b/examples/er-rest-example/Makefile @@ -22,7 +22,7 @@ PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES) SMALL=1 # REST Engine shall use Erbium CoAP implementation -APPS += erbium +APPS += er-coap APPS += rest-engine # optional rules to get assembly