summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorjixinyi <[email protected]>2019-01-18 16:37:51 +0800
committerjixinyi <[email protected]>2019-01-18 16:37:51 +0800
commit2e83f0db5a94ba44cbbcd9d41863215934a738c0 (patch)
tree20c25957e655e18308b2ceb1285562874c9b89aa /src/Makefile
parent6c370f68c7b54973f24558a7f51d6611337fc3e9 (diff)
parent263cdc86b5b2f58bd3003f0af3234bc4ea4690a4 (diff)
重构调用maat新接口
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile5
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) $<