From 40bb39f782d04b0f758651b83b63635edc65f777 Mon Sep 17 00:00:00 2001 From: Valentin Rakush Date: Sat, 19 Oct 2019 19:36:53 +0000 Subject: [PATCH] adding prerequisites to compile lib .c/.cpp files --- lib/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index d897e3be4..f5e496b63 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -94,14 +94,15 @@ _OBJ = c_tokenizer.o OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ)) _OBJ_CXX = ProxySQL_GloVars.oo network.oo debug.oo configfile.oo Query_Cache.oo SpookyV2.oo MySQL_Authentication.oo gen_utils.oo sqlite3db.oo mysql_connection.oo MySQL_HostGroups_Manager.oo mysql_data_stream.oo MySQL_Thread.oo MySQL_Session.oo MySQL_Protocol.oo mysql_backend.oo Query_Processor.oo ProxySQL_Admin.oo MySQL_Monitor.oo MySQL_Logger.oo thread.oo MySQL_PreparedStatement.oo ProxySQL_Cluster.oo SQLite3_Server.oo ClickHouse_Authentication.oo ClickHouse_Server.oo ProxySQL_Statistics.oo Chart_bundle_js.oo ProxySQL_HTTP_Server.oo font-awesome.min.css.oo main-bundle.min.css.oo set_parser.oo OBJ_CXX = $(patsubst %,$(ODIR)/%,$(_OBJ_CXX)) +HEADERS = ../include/*.h ../include/*.hpp -%.ko: %.cpp +%.ko: %.cpp $(HEADERS) $(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) -$(ODIR)/%.o: %.c +$(ODIR)/%.o: %.c $(HEADERS) $(CC) -fPIC -c -o $@ $< $(MYCFLAGS) $(CFLAGS) -$(ODIR)/%.oo: %.cpp +$(ODIR)/%.oo: %.cpp $(HEADERS) $(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS) libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) $(RE2_PATH)/obj/libre2.a $(SQLITE3_DIR)/sqlite3.o