diff --git a/Makefile.include b/Makefile.include index 149086d7c..d4478c748 100644 --- a/Makefile.include +++ b/Makefile.include @@ -191,6 +191,8 @@ endif ifneq ($(RELSTR),) CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\" +else +CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-3.x\" endif ### Automatic dependency generation diff --git a/core/contiki-version.h b/core/contiki-version.h deleted file mode 100644 index 35b61a9ea..000000000 --- a/core/contiki-version.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2004, Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * This file is part of the Contiki operating system. - * - * Author: Adam Dunkels - * - */ -#ifndef __CONTIKI_VERSION__ -#define __CONTIKI_VERSION__ - -#ifndef CONTIKI_VERSION_STRING -#define CONTIKI_VERSION_STRING "Contiki 3.x" -#endif /* CONTIKI_VERSION_STRING */ - -#endif /* __CONTIKI_VERSION__ */ diff --git a/core/contiki.h b/core/contiki.h index f3eb1de4d..816b21dd6 100644 --- a/core/contiki.h +++ b/core/contiki.h @@ -34,7 +34,6 @@ #ifndef CONTIKI_H_ #define CONTIKI_H_ -#include "contiki-version.h" #include "contiki-conf.h" #include "contiki-default-conf.h"