Add binlogrouter back into Makefile following merge
This commit is contained in:
		@ -47,7 +47,8 @@ CLIOBJ=$(CLISRCS:.c=.o)
 | 
				
			|||||||
SRCS=$(TESTSRCS) $(READCONSRCS) $(DEBUGCLISRCS) cli.c
 | 
					SRCS=$(TESTSRCS) $(READCONSRCS) $(DEBUGCLISRCS) cli.c
 | 
				
			||||||
OBJ=$(SRCS:.c=.o)
 | 
					OBJ=$(SRCS:.c=.o)
 | 
				
			||||||
LIBS=$(UTILSPATH)/skygw_utils.o -lssl -llog_manager
 | 
					LIBS=$(UTILSPATH)/skygw_utils.o -lssl -llog_manager
 | 
				
			||||||
MODULES= libdebugcli.so libreadconnroute.so libtestroute.so libcli.so
 | 
					MODULES= libdebugcli.so libreadconnroute.so libtestroute.so libcli.so \
 | 
				
			||||||
 | 
						libbinlogrouter.so
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
all:	$(MODULES)
 | 
					all:	$(MODULES)
 | 
				
			||||||
@ -66,27 +67,33 @@ libcli.so: $(CLIOBJ)
 | 
				
			|||||||
	$(CC) $(LDFLAGS) $(CLIOBJ) $(LIBS) -o $@
 | 
						$(CC) $(LDFLAGS) $(CLIOBJ) $(LIBS) -o $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
libreadwritesplit.so:
 | 
					libreadwritesplit.so:
 | 
				
			||||||
#	(cd readwritesplit; touch depend.mk ; make; cp $@ ..)
 | 
						(cd readwritesplit; touch depend.mk ; make; cp $@ ..)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					libbinlogrouter.so:
 | 
				
			||||||
 | 
						(cd binlog; touch depend.mk ; make; cp $@ ..)
 | 
				
			||||||
.c.o:
 | 
					.c.o:
 | 
				
			||||||
	$(CC) $(CFLAGS) $< -o $@
 | 
						$(CC) $(CFLAGS) $< -o $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
clean:
 | 
					clean:
 | 
				
			||||||
	$(DEL) $(OBJ) $(MODULES)
 | 
						$(DEL) $(OBJ) $(MODULES)
 | 
				
			||||||
	(cd readwritesplit; touch depend.mk; make clean)
 | 
						(cd readwritesplit; touch depend.mk; make clean)
 | 
				
			||||||
 | 
						(cd binlog; touch depend.mk; make clean)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
tags:
 | 
					tags:
 | 
				
			||||||
	ctags $(SRCS) $(HDRS)
 | 
						ctags $(SRCS) $(HDRS)
 | 
				
			||||||
	(cd readwritesplit; make tags)
 | 
						(cd readwritesplit; make tags)
 | 
				
			||||||
 | 
						(cd binlog; make tags)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
depend:
 | 
					depend:
 | 
				
			||||||
	@$(DEL) depend.mk
 | 
						@$(DEL) depend.mk
 | 
				
			||||||
	cc -M $(CFLAGS) $(SRCS) > depend.mk
 | 
						cc -M $(CFLAGS) $(SRCS) > depend.mk
 | 
				
			||||||
	(cd readwritesplit; touch depend.mk ; make depend)
 | 
						(cd readwritesplit; touch depend.mk ; make depend)
 | 
				
			||||||
 | 
						(cd binlog; touch depend.mk ; make depend)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
install: $(MODULES)
 | 
					install: $(MODULES)
 | 
				
			||||||
	install -D $(MODULES) $(DEST)/modules
 | 
						install -D $(MODULES) $(DEST)/modules
 | 
				
			||||||
	(cd readwritesplit; make DEST=$(DEST) install)
 | 
						(cd readwritesplit; make DEST=$(DEST) install)
 | 
				
			||||||
 | 
						(cd binlog; make DEST=$(DEST) install)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cleantests:
 | 
					cleantests:
 | 
				
			||||||
	$(MAKE) -C test cleantests
 | 
						$(MAKE) -C test cleantests
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user