gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	src/entry/Maat_rule.cpp
#	src/entry/Makefile
This commit is contained in:
zhengchao
2015-12-24 18:11:59 +08:00
parent 848a70cb43 81d9a389cc
commit f4ad9d1765
4 changed files with 1895 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/entry/Makefile
View File

@@ -5,7 +5,9 @@ CC = gcc
CCC = g++
CFLAGS = -Wall -g -fPIC
CFLAGS += $(OPTFLAGS)
LDFLAGS = -lMESA_handle_logger -lMESA_htable -lpthread -lm -lrulescan -lpcre
LDDICTATOR = -Wl,-wrap,malloc -Wl,-wrap,calloc -Wl,-wrap,free -Wl,-wrap,realloc
LDFLAGS = -lMESA_handle_logger -lMESA_htable -lpthread
#LDFLAGS += $(LDDICTATOR)
MAILLIB = ../lib
G_H_DIR =../inc_internal