diff --git a/Makefile b/Makefile index 7960c6957ade5a9f674d7927d876ae334ffc848d..05c50f93b783291c165da02a95a06222e63bd126 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ build/lib build: mkdir -p $@ %: build/%.o Makefile - $(CC) $(LDFLAGS) $(LDFLAGS_$(*)) -o $@ $(filter %.o,$^) + $(CC) -o $@ $(filter %.o,$^) $(LDFLAGS) $(LDFLAGS_$(*)) build/%.o: %.c Makefile $(CC) $(CCFLAGS) -c -o $@ $< diff --git a/plugins/comedi/Makefile b/plugins/comedi/Makefile index f19f0f3b9ef543e2680d448ec4d522d25b1e4510..8975d5a6f8d62613591b29a64836b3f28d8e7dbc 100644 --- a/plugins/comedi/Makefile +++ b/plugins/comedi/Makefile @@ -6,7 +6,7 @@ LDFLAGS_comedi=-shared -fPIC -L../../build -lmoberg -lcomedi -lm all: $(LIBRARIES:%=build/%) build/libmoberg_%.so: build/%.o Makefile | build - $(CC) $(LDFLAGS) $(LDFLAGS_$(*)) -o $@ $(filter %.o,$^) + $(CC) -o $@ $(filter %.o,$^) $(LDFLAGS) $(LDFLAGS_$(*)) .PRECIOUS: build/%.o build/%.o: %.c Makefile | build diff --git a/plugins/libtest/Makefile b/plugins/libtest/Makefile index aeb43e2c9af57c311d047e248ce801b93b21b8c1..ad96bc0d3e7dff85279cc42406fbae321e88e3b1 100644 --- a/plugins/libtest/Makefile +++ b/plugins/libtest/Makefile @@ -6,7 +6,7 @@ LDFLAGS_libtest=-shared -fPIC -L../../build -lmoberg all: $(LIBRARIES:%=build/%) build/libmoberg_%.so: build/%.o Makefile | build - $(CC) $(LDFLAGS) $(LDFLAGS_$(*)) -o $@ $(filter %.o,$^) + $(CC) -o $@ $(filter %.o,$^) $(LDFLAGS) $(LDFLAGS_$(*)) .PRECIOUS: build/%.o build/%.o: %.c Makefile | build diff --git a/plugins/serial2002/Makefile b/plugins/serial2002/Makefile index b366d1290e3c3d7739233f10079137c8d01737f2..f2a2caa97cb756e37c76babb196dd1de10bfcca5 100644 --- a/plugins/serial2002/Makefile +++ b/plugins/serial2002/Makefile @@ -6,7 +6,7 @@ LDFLAGS_serial2002=-shared -fPIC -L../../build -lmoberg all: $(LIBRARIES:%=build/%) build/libmoberg_%.so: build/%.o Makefile | build - $(CC) $(LDFLAGS) $(LDFLAGS_$(*)) -o $@ $(filter %.o,$^) + $(CC) -o $@ $(filter %.o,$^) $(LDFLAGS) $(LDFLAGS_$(*)) .PRECIOUS: build/%.o build/%.o: %.c Makefile | build diff --git a/test/Makefile b/test/Makefile index 50ee3e2374622eb6f38c9760941a259f35d7d9fa..50a8391cb64b3fa3db692535928581ef3f443f47 100644 --- a/test/Makefile +++ b/test/Makefile @@ -9,8 +9,8 @@ ENV_TEST = LD_LIBRARY_PATH=../build \ JULIA_LOAD_PATH=../adaptors/julia LDFLAGS_test_moberg4simulink = -lmoberg4simulink CCFLAGS_test_moberg4simulink = -I../adaptors/matlab -Wall -Werror -I$(shell pwd) -g -PYTHON2PATH=$(shell realpath ../adaptors/python/install/usr/lib*/python2*/site-packages) -PYTHON3PATH=$(shell realpath ../adaptors/python/install/usr/lib*/python3*/site-packages) +PYTHON2PATH=$(shell realpath ../adaptors/python2/install/usr/lib*/python2*/site-packages) +PYTHON3PATH=$(shell realpath ../adaptors/python3/install/usr/lib*/python3*/site-packages) all: .PHONY: test @@ -34,7 +34,7 @@ run_jl_%: %.jl .PRECIOUS: build/% build/%: %.c | build - $(CC) $(CCFLAGS) $(CCFLAGS_$*) $(LDFLAGS) $(LDFLAGS_$*) -o $@ $< + $(CC) $(CCFLAGS) $(CCFLAGS_$*) -o $@ $< $(LDFLAGS) $(LDFLAGS_$*) build: mkdir build