kernel: move common header to include directory

Signed-off-by: Federico Vaga <federico.vaga@cern.ch> NOTE This commit has been created by `git subtree` on the Mock Turtle repository on tag mock-turtle-2.0 This commit will not compile

kernel: move common header to include directory
Signed-off-by: Federico Vaga <federico.vaga@cern.ch> NOTE This commit has been created by `git subtree` on the Mock Turtle repository on tag mock-turtle-2.0 This commit will not compile
90e8e4b0 · Federico Vaga · 4c705886 · 90e8e4b0 · 90e8e4b0 · 90e8e4b0
Commit 90e8e4b0 authored Aug 12, 2015 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

Makefile lib/Makefile +2 -1

Makefile rt/fd/Makefile +3 -3

Makefile rt/tdc/Makefile +3 -3

Makefile tools/Makefile +2 -1

No files found.
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -14,7 +14,8 @@ LOBJ += libwrtd-logging.o
 LOBJ += libwrtd-input.o
 LOBJ += libwrtd-output.o

-CFLAGS += -Wall -ggdb -O2 -I. -I../include -I$(WRNC)/lib -I$(WRNC)/kernel -I$(LIBFD) -I$(LIBTDC) -I$(LIBFD)/../kernel $(EXTRACFLAGS)
+CFLAGS += -Wall -ggdb -O2 -I. -I../include -I$(WRNC)/include -I$(WRNC)/lib -I$(LIBFD) -I$(LIBTDC) -I$(LIBFD)/../kernel
+CFLAGS += $(EXTRACFLAGS)
 LDLIBS += -L. -lwrtd



--- a/rt/fd/Makefile
+++ b/rt/fd/Makefile
 OBJS := rt-fd.o
 OBJS += ../common/loop-queue.o
 OUTPUT = rt-fd
-PATH_COMMON = ../../../common/
+WRNC = ../../../../
+
 EXTRA_CFLAGS += -I../../include
 EXTRA_CFLAGS += -I../common
-
-include $(PATH_COMMON)/rt/Makefile
+include $(WRNC)/applications/common/rt/Makefile
--- a/rt/tdc/Makefile
+++ b/rt/tdc/Makefile
 OBJS := rt-tdc.o
 OBJS += ../common/loop-queue.o
 OUTPUT = rt-tdc
-PATH_COMMON = ../../../common/
+WRNC = ../../../../
+
 EXTRA_CFLAGS += -I../../include
 EXTRA_CFLAGS += -I../common
-
-include $(PATH_COMMON)/rt/Makefile
+include $(WRNC)/applications/common/rt/Makefile
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,7 +7,8 @@ DESTDIR ?= /usr/local

 WRNC ?= ../../../

-CFLAGS += -Wall -ggdb -I. -I../include -I$(WRNC)/lib -I$(WRNC)/kernel -I../lib $(EXTRACFLAGS)
+CFLAGS += -Wall -ggdb -I. -I../include -I$(WRNC)/include -I$(WRNC)/lib -I../lib
+CFLAGS += $(EXTRACFLAGS)
 LDLIBS += -L../lib -lwrtd -L$(WRNC)/lib -lwrnc

 PROGS := wrtd-boot