Skip to content

GitLab

Commit 3e7379b0 authored by Demo User's avatar Demo User
Browse files

merge conflict

parents 6a23b8d9 c70be89d
Hide whitespace changes
Inline Side-by-side
measure_motor_params/Makefile
View file @ 3e7379b0
...@@ -3,15 +3,17 @@ TARGET = ../bin/measure_motor_params ...@@ -3,15 +3,17 @@ TARGET = ../bin/measure_motor_params
CC := gcc CC := gcc
LINKER := gcc -o LINKER := gcc -o
CFLAGS := -c -Wall -g CFLAGS := -c -Wall -g `pkg-config --cflags lcm`
LFLAGS := -lm -lrt -lpthread -l:librobotcontrol.so.1 LFLAGS := -lm -lrt -lpthread -l:librobotcontrol.so.1 -L `pkg-config --libs lcm`
SOURCES := $(wildcard *.c) SOURCES := $(wildcard *.c)
SOURCES := $(SOURCES) $(wildcard ../common/*.c) SOURCES := $(SOURCES) $(wildcard ../common/*.c)
INCLUDES := $(wildcard *.h) INCLUDES := $(wildcard *.h)
INCLUDES := $(INCLUDES) $(wildcard ../common/*.h) INCLUDES := $(INCLUDES) $(wildcard ../common/*.h)
OBJECTS := $(SOURCES:$%.c=$%.o) OBJECTS := $(SOURCES:$%.c=$%.o)
# Note: .c / .cpp => link libraries: .o (object files) => binary files.(executables) LCMTYPES := $(shell find ../lcmtypes/ -name '*.lcm')
LCMOBJS := $(LCMTYPES:$%.lcm=$%.o)
prefix := /usr/local prefix := /usr/local
RM := rm -f RM := rm -f
INSTALL := install -m 4755 INSTALL := install -m 4755
...@@ -24,7 +26,7 @@ LINKNAME := link_to_startup_program ...@@ -24,7 +26,7 @@ LINKNAME := link_to_startup_program
# linking Objects # linking Objects
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
@$(LINKER) $@ $(OBJECTS) $(LFLAGS) @$(LINKER) $@ $(OBJECTS) $(LCMOBJS) $(LFLAGS)
# compiling command # compiling command
...@@ -50,6 +52,7 @@ install: ...@@ -50,6 +52,7 @@ install:
clean: clean:
@$(RM) $(OBJECTS) @$(RM) $(OBJECTS)
@$(RM) $(LCMOBJS)
@$(RM) $(IGNORE) @$(RM) $(IGNORE)
@$(RM) $(IGNORE:=.o) @$(RM) $(IGNORE:=.o)
@$(RM) $(TARGET) @$(RM) $(TARGET)
......
test_motors/Makefile
View file @ 3e7379b0
...@@ -3,14 +3,16 @@ TARGET = ../bin/test_motors ...@@ -3,14 +3,16 @@ TARGET = ../bin/test_motors
CC := gcc CC := gcc
LINKER := gcc -o LINKER := gcc -o
CFLAGS := -c -Wall -g CFLAGS := -c -Wall -g `pkg-config --cflags lcm`
LFLAGS := -lm -lrt -lpthread -l:librobotcontrol.so.1 LFLAGS := -lm -lrt -lpthread -l:librobotcontrol.so.1 -L `pkg-config --libs lcm`
SOURCES := $(wildcard *.c) SOURCES := $(wildcard *.c)
SOURCES := $(SOURCES) $(wildcard ../common/*.c) SOURCES := $(SOURCES) $(wildcard ../common/*.c)
INCLUDES := $(wildcard *.h) INCLUDES := $(wildcard *.h)
INCLUDES := $(INCLUDES) $(wildcard ../common/*.h) INCLUDES := $(INCLUDES) $(wildcard ../common/*.h)
OBJECTS := $(SOURCES:$%.c=$%.o) OBJECTS := $(SOURCES:$%.c=$%.o)
LCMTYPES := $(shell find ../lcmtypes/ -name '*.lcm')
LCMOBJS := $(LCMTYPES:$%.lcm=$%.o)
prefix := /usr/local prefix := /usr/local
RM := rm -f RM := rm -f
...@@ -24,7 +26,7 @@ LINKNAME := link_to_startup_program ...@@ -24,7 +26,7 @@ LINKNAME := link_to_startup_program
# linking Objects # linking Objects
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS)
@$(LINKER) $@ $(OBJECTS) $(LFLAGS) @$(LINKER) $@ $(OBJECTS) $(LCMOBJS) $(LFLAGS)
# compiling command # compiling command
...@@ -49,6 +51,7 @@ install: ...@@ -49,6 +51,7 @@ install:
clean: clean:
@$(RM) $(OBJECTS) @$(RM) $(OBJECTS)
@$(RM) $(LCMOBJS)
@$(RM) $(IGNORE) @$(RM) $(IGNORE)
@$(RM) $(IGNORE:=.o) @$(RM) $(IGNORE:=.o)
@$(RM) $(TARGET) @$(RM) $(TARGET)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment