diff options
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile index e9c52f4..40b519d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,8 +5,13 @@ CFLAGS = -Wall -g -fPIC #1INC += /usr/include/MESA LDFLAGS = -L./lib/ LIBS = -lMESA_handle_logger -lMESA_prof_load -lMESA_htable -lmaatframe +<<<<<<< HEAD OBJ =mctrl.o TARGET =mctrl +======= +OBJ =ir_mctrl.o +TARGET =ir_mctrl +>>>>>>> 263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 .cpp.o: $(CCC) -c $(CFLAGS) $(INC) $< |