Skip to content

Commit

Permalink
Fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Magnus Feuer committed Jul 9, 2019
2 parents 8bd66e8 + 1d7bfff commit ade08ae
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ TEST_TARGET=rmc_test
WIRESHARK_TARGET=rmc_wireshark_plugin.so
DESTDIR ?= /usr/local

CFLAGS = -O2 -fpic -Wall -D_GNU_SOURCE
CFLAGS ?= -O3 -fpic -Wall -D_GNU_SOURCE

.PHONY: all clean etags print_obj install uninstall

all: $(LIB_TARGET) $(LIB_SO_TARGET) $(TEST_TARGET)
Expand Down

0 comments on commit ade08ae

Please sign in to comment.