Skip to content

Commit

Permalink
a little whitespace cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
flixr committed Nov 7, 2011
1 parent 8286754 commit b02f38f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
Expand Up @@ -11,11 +11,11 @@ endif


ifeq ($(NORADIO), False)
$(TARGET).CFLAGS += -DRADIO_CONTROL
$(TARGET).CFLAGS += -DRADIO_CONTROL_TYPE_H=\"radio_control/rc_datalink.h\"
$(TARGET).CFLAGS += -DRADIO_CONTROL_TYPE_DATALINK
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/radio_control.c
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/radio_control/rc_datalink.c
$(TARGET).CFLAGS += -DRADIO_CONTROL
$(TARGET).CFLAGS += -DRADIO_CONTROL_TYPE_H=\"radio_control/rc_datalink.h\"
$(TARGET).CFLAGS += -DRADIO_CONTROL_TYPE_DATALINK
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/radio_control.c
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/radio_control/rc_datalink.c
# arch only with sim target for compatibility (empty functions)
sim.srcs += $(SRC_ARCH)/subsystems/radio_control/rc_datalink.c
sim.srcs += $(SRC_ARCH)/subsystems/radio_control/rc_datalink.c
endif
12 changes: 6 additions & 6 deletions sw/ground_segment/misc/Makefile
Expand Up @@ -2,21 +2,21 @@ UNAME = $(shell uname -s)

ifeq ("$(UNAME)","Darwin")
LIBRARYS = -L/opt/local/lib
else
LIBRARYS = -s
else
LIBRARYS = -s
endif


all: davis2ivy kestrel2ivy

clean:
rm *.o davis2ivy kestrel2ivy
rm *.o davis2ivy kestrel2ivy

davis2ivy: davis2ivy.o
g++ -o davis2ivy davis2ivy.o $(LIBRARYS) -livy
g++ -o davis2ivy davis2ivy.o $(LIBRARYS) -livy

kestrel2ivy: kestrel2ivy.o
g++ -o kestrel2ivy kestrel2ivy.o $(LIBRARYS) -livy
g++ -o kestrel2ivy kestrel2ivy.o $(LIBRARYS) -livy

%.o : %.c
gcc -c -O2 -Wall -I /opt/local/include/ $<
gcc -c -O2 -Wall -I /opt/local/include/ $<

0 comments on commit b02f38f

Please sign in to comment.