From 36e73c4abb520aa65722ef5e1483bcb8b75bf9f4 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Sun, 5 Sep 2010 17:37:35 -0300 Subject: [PATCH] Moved tools/ out of atrf, in preparation of merge with atusd. - atrf/tools/: moved to tools/ - tools/Makefile: updated path to Makefile.recurse - tools/atspi-id/Makefile, tools/atspi-reset/Makefile, tools/atspi-rssi/Makefile, tools/atspi-trim/Makefile, tools/atspi-txrx/Makefile, tools/lib/Makefile: updated paths to f32xbase and to atrf/fw/include --- {atrf/tools => tools}/Makefile | 2 +- {atrf/tools => tools}/atspi-id/Makefile | 4 ++-- {atrf/tools => tools}/atspi-id/atspi-id.c | 0 {atrf/tools => tools}/atspi-reset/Makefile | 4 ++-- {atrf/tools => tools}/atspi-reset/atspi-reset.c | 0 {atrf/tools => tools}/atspi-rssi/Makefile | 4 ++-- {atrf/tools => tools}/atspi-rssi/atspi-rssi.c | 0 {atrf/tools => tools}/atspi-trim/Makefile | 4 ++-- {atrf/tools => tools}/atspi-trim/atspi-trim.c | 0 {atrf/tools => tools}/atspi-txrx/Makefile | 4 ++-- {atrf/tools => tools}/atspi-txrx/atspi-txrx.c | 0 {atrf/tools => tools}/include/atspi.h | 0 {atrf/tools => tools}/lib/Makefile | 4 ++-- {atrf/tools => tools}/lib/atspi.c | 0 14 files changed, 13 insertions(+), 13 deletions(-) rename {atrf/tools => tools}/Makefile (93%) rename {atrf/tools => tools}/atspi-id/Makefile (86%) rename {atrf/tools => tools}/atspi-id/atspi-id.c (100%) rename {atrf/tools => tools}/atspi-reset/Makefile (86%) rename {atrf/tools => tools}/atspi-reset/atspi-reset.c (100%) rename {atrf/tools => tools}/atspi-rssi/Makefile (86%) rename {atrf/tools => tools}/atspi-rssi/atspi-rssi.c (100%) rename {atrf/tools => tools}/atspi-trim/Makefile (86%) rename {atrf/tools => tools}/atspi-trim/atspi-trim.c (100%) rename {atrf/tools => tools}/atspi-txrx/Makefile (86%) rename {atrf/tools => tools}/atspi-txrx/atspi-txrx.c (100%) rename {atrf/tools => tools}/include/atspi.h (100%) rename {atrf/tools => tools}/lib/Makefile (84%) rename {atrf/tools => tools}/lib/atspi.c (100%) diff --git a/atrf/tools/Makefile b/tools/Makefile similarity index 93% rename from atrf/tools/Makefile rename to tools/Makefile index f177a59..ee3f1de 100644 --- a/atrf/tools/Makefile +++ b/tools/Makefile @@ -14,4 +14,4 @@ DIRS=atspi-id atspi-reset atspi-rssi atspi-trim atspi-txrx TARGET_ONLY_DIRS=lib -include ../../Makefile.recurse +include ../Makefile.recurse diff --git a/atrf/tools/atspi-id/Makefile b/tools/atspi-id/Makefile similarity index 86% rename from atrf/tools/atspi-id/Makefile rename to tools/atspi-id/Makefile index 10c2c64..27d91a8 100644 --- a/atrf/tools/atspi-id/Makefile +++ b/tools/atspi-id/Makefile @@ -11,11 +11,11 @@ # -F32XBASE = ../../../../f32xbase +F32XBASE = ../../../f32xbase MAIN = atspi-id include $(F32XBASE)/lib/Makefile.common -CFLAGS += -I../../fw/include -I../include +CFLAGS += -I../../atrf/fw/include -I../include LDLIBS += -L../lib -latspi diff --git a/atrf/tools/atspi-id/atspi-id.c b/tools/atspi-id/atspi-id.c similarity index 100% rename from atrf/tools/atspi-id/atspi-id.c rename to tools/atspi-id/atspi-id.c diff --git a/atrf/tools/atspi-reset/Makefile b/tools/atspi-reset/Makefile similarity index 86% rename from atrf/tools/atspi-reset/Makefile rename to tools/atspi-reset/Makefile index 009ec18..b254e98 100644 --- a/atrf/tools/atspi-reset/Makefile +++ b/tools/atspi-reset/Makefile @@ -11,11 +11,11 @@ # -F32XBASE = ../../../../f32xbase +F32XBASE = ../../../f32xbase MAIN = atspi-reset include $(F32XBASE)/lib/Makefile.common -CFLAGS += -I../../fw/include -I../include +CFLAGS += -I../../atrf/fw/include -I../include LDLIBS += -L../lib -latspi diff --git a/atrf/tools/atspi-reset/atspi-reset.c b/tools/atspi-reset/atspi-reset.c similarity index 100% rename from atrf/tools/atspi-reset/atspi-reset.c rename to tools/atspi-reset/atspi-reset.c diff --git a/atrf/tools/atspi-rssi/Makefile b/tools/atspi-rssi/Makefile similarity index 86% rename from atrf/tools/atspi-rssi/Makefile rename to tools/atspi-rssi/Makefile index 3327236..7b96d7e 100644 --- a/atrf/tools/atspi-rssi/Makefile +++ b/tools/atspi-rssi/Makefile @@ -11,11 +11,11 @@ # -F32XBASE = ../../../../f32xbase +F32XBASE = ../../../f32xbase MAIN = atspi-rssi include $(F32XBASE)/lib/Makefile.common -CFLAGS += -I../../fw/include -I../include +CFLAGS += -I../../atrf/fw/include -I../include LDLIBS += -L../lib -latspi diff --git a/atrf/tools/atspi-rssi/atspi-rssi.c b/tools/atspi-rssi/atspi-rssi.c similarity index 100% rename from atrf/tools/atspi-rssi/atspi-rssi.c rename to tools/atspi-rssi/atspi-rssi.c diff --git a/atrf/tools/atspi-trim/Makefile b/tools/atspi-trim/Makefile similarity index 86% rename from atrf/tools/atspi-trim/Makefile rename to tools/atspi-trim/Makefile index 63a32b6..1f1788f 100644 --- a/atrf/tools/atspi-trim/Makefile +++ b/tools/atspi-trim/Makefile @@ -11,11 +11,11 @@ # -F32XBASE = ../../../../f32xbase +F32XBASE = ../../../f32xbase MAIN = atspi-trim include $(F32XBASE)/lib/Makefile.common -CFLAGS += -I../../fw/include -I../include +CFLAGS += -I../../atrf/fw/include -I../include LDLIBS += -L../lib -latspi diff --git a/atrf/tools/atspi-trim/atspi-trim.c b/tools/atspi-trim/atspi-trim.c similarity index 100% rename from atrf/tools/atspi-trim/atspi-trim.c rename to tools/atspi-trim/atspi-trim.c diff --git a/atrf/tools/atspi-txrx/Makefile b/tools/atspi-txrx/Makefile similarity index 86% rename from atrf/tools/atspi-txrx/Makefile rename to tools/atspi-txrx/Makefile index a23f155..a8c9564 100644 --- a/atrf/tools/atspi-txrx/Makefile +++ b/tools/atspi-txrx/Makefile @@ -11,11 +11,11 @@ # -F32XBASE = ../../../../f32xbase +F32XBASE = ../../../f32xbase MAIN = atspi-txrx include $(F32XBASE)/lib/Makefile.common -CFLAGS += -I../../fw/include -I../include +CFLAGS += -I../../atrf/fw/include -I../include LDLIBS += -L../lib -latspi diff --git a/atrf/tools/atspi-txrx/atspi-txrx.c b/tools/atspi-txrx/atspi-txrx.c similarity index 100% rename from atrf/tools/atspi-txrx/atspi-txrx.c rename to tools/atspi-txrx/atspi-txrx.c diff --git a/atrf/tools/include/atspi.h b/tools/include/atspi.h similarity index 100% rename from atrf/tools/include/atspi.h rename to tools/include/atspi.h diff --git a/atrf/tools/lib/Makefile b/tools/lib/Makefile similarity index 84% rename from atrf/tools/lib/Makefile rename to tools/lib/Makefile index 6e070e6..07b5913 100644 --- a/atrf/tools/lib/Makefile +++ b/tools/lib/Makefile @@ -11,11 +11,11 @@ # -F32XBASE = ../../../../f32xbase +F32XBASE = ../../../f32xbase LIB = libatspi.a -CFLAGS = -Wall -I$(F32XBASE)/include -I../../fw/include -I../include +CFLAGS = -Wall -I$(F32XBASE)/include -I../../atrf/fw/include -I../include OBJS = $(F32XBASE)/lib/usb.o atspi.o .PHONY: all clean spotless diff --git a/atrf/tools/lib/atspi.c b/tools/lib/atspi.c similarity index 100% rename from atrf/tools/lib/atspi.c rename to tools/lib/atspi.c