1
0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-11-22 17:21:52 +02:00

tools/: renamed OpenWRT target from "ben" to "ben_openwrt" and added "ben_jlime"

- tools/Makefile (upload): make destinastion host name ("ben" or "jlime")
  depend on TARGET
- tools/Makefile.common (CC_ben, CFLAGS_ben, LDLIBS_ben, MACROS_ben):
  renamed to *_openwrt and added *_jlime equivalents
- tools/atrf-rssi/Makefile: added settings to use SDL_gfx on Jlime
- tools/lib/Makefile (OBJS_ben): renamed to OBJS_ben_openwrt and added
  OBJS_ben_jlime
This commit is contained in:
Werner Almesberger 2011-01-09 18:54:49 -03:00
parent 4d2395e23c
commit 45e55fe2f1
4 changed files with 36 additions and 14 deletions

View File

@ -1,8 +1,8 @@
# #
# tools/Makefile - Build the ATRF-specific tools # tools/Makefile - Build the ATRF-specific tools
# #
# Written 2010 by Werner Almesberger # Written 2010-2011 by Werner Almesberger
# Copyright 2010 Werner Almesberger # Copyright 2010-2011 Werner Almesberger
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -14,9 +14,16 @@
DIRS=atrf-id atrf-reset atrf-rssi atrf-trim atrf-txrx DIRS=atrf-id atrf-reset atrf-rssi atrf-trim atrf-txrx
TARGET_ONLY_DIRS=lib TARGET_ONLY_DIRS=lib
ifeq ($(TARGET),ben_jlime)
HOST = jlime
else
HOST = ben
endif
include ../Makefile.recurse include ../Makefile.recurse
.PHONY: upload .PHONY: upload
upload: upload:
scp `for n in $(DIRS); do echo $$n/$$n; done` ben: scp `for n in $(DIRS); do echo $$n/$$n; done` $(HOST):

View File

@ -1,8 +1,8 @@
# #
# tools/Makefile.common - Common items in ATRF tool makefiles # tools/Makefile.common - Common items in ATRF tool makefiles
# #
# Written 2010 by Werner Almesberger # Written 2010-2011 by Werner Almesberger
# Copyright 2010 Werner Almesberger # Copyright 2010-2011 Werner Almesberger
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -21,13 +21,20 @@ include $(F32XBASE)/lib/Makefile.common
endif endif
CC_host = gcc CC_host = gcc
CC_ben = mipsel-openwrt-linux-gcc CC_ben_jlime = mipsel-linux-gcc
CC_ben_openwrt = mipsel-openwrt-linux-gcc
CFLAGS_host = CFLAGS_host =
CFLAGS_ben = CFLAGS_ben_jlime =
CFLAGS_ben_openwrt =
LDLIBS_host = -lusb LDLIBS_host = -lusb
LDLIBS_ben = LDLIBS_ben_jlime =
LDLIBS_ben_openwrt =
MACROS_host = -DHAVE_USB MACROS_host = -DHAVE_USB
MACROS_ben = -DHAVE_USD MACROS_ben_jlime = -DHAVE_USD
MACROS_ben_openwrt = -DHAVE_USD
CC_normal := $(CC_$(TARGET)) CC_normal := $(CC_$(TARGET))
AR_normal := $(AR) AR_normal := $(AR)

View File

@ -1,8 +1,8 @@
# #
# atrf-rssi/Makefile - Build the spectrum scan utility # atrf-rssi/Makefile - Build the spectrum scan utility
# #
# Written 2010 by Werner Almesberger # Written 2010-2011 by Werner Almesberger
# Copyright 2010 Werner Almesberger # Copyright 2010-2011 Werner Almesberger
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -20,4 +20,9 @@ MACROS_host += -DHAVE_GFX
LDLIBS_host += $(shell sdl-config --libs) -lSDL_gfx LDLIBS_host += $(shell sdl-config --libs) -lSDL_gfx
OBJS_host = gui.o zgrid.o digit.o OBJS_host = gui.o zgrid.o digit.o
CFLAGS_ben_jlime += $(shell sdl-config --cflags)
MACROS_ben_jlime += -DHAVE_GFX
LDLIBS_ben_jlime += -lSDL -lSDL_gfx
OBJS_ben_jlime = gui.o zgrid.o digit.o
$(MAIN): $(OBJS_$(TARGET)) $(MAIN): $(OBJS_$(TARGET))

View File

@ -1,8 +1,8 @@
# #
# lib/Makefile - Build the ATRF library # lib/Makefile - Build the ATRF library
# #
# Written 2010 by Werner Almesberger # Written 2010-2011 by Werner Almesberger
# Copyright 2010 Werner Almesberger # Copyright 2010-2011 Werner Almesberger
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -16,8 +16,11 @@ LIB = libatrf.a
include ../Makefile.common include ../Makefile.common
CFLAGS += -Wall -I$(F32XBASE)/include CFLAGS += -Wall -I$(F32XBASE)/include
OBJS_host = atusb.o $(F32XBASE)/lib/usb.o OBJS_host = atusb.o $(F32XBASE)/lib/usb.o
OBJS_ben = atusd.o OBJS_ben_jlime = atusd.o
OBJS_ben_openwrt = atusd.o
OBJS = atrf.o misctxrx.o $(OBJS_$(TARGET)) OBJS = atrf.o misctxrx.o $(OBJS_$(TARGET))
.PHONY: all clean spotless .PHONY: all clean spotless