diff --git a/Makefile b/Makefile index 9cbd79555..4a8af8f82 100644 --- a/Makefile +++ b/Makefile @@ -23,19 +23,19 @@ DEST=$(HOME)/usr/local/skysql all: (cd log_manager; make) (cd query_classifier; make) - (cd epoll_v1.0; make) + (cd server; make) clean: (cd log_manager; make clean) (cd query_classifier; make clean) - (cd epoll_v1.0; make clean) + (cd server; make clean) depend: (cd log_manager; make depend) (cd query_classifier; make depend) - (cd epoll_v1.0; make depend) + (cd server; make depend) install: - (cd epoll_v1.0; make DEST=$(DEST) install) + (cd server; make DEST=$(DEST) install) (cd log_manager; make DEST=$(DEST) install) (cd query_classifier; make DEST=$(DEST) install) diff --git a/maxscale.spec b/maxscale.spec new file mode 100644 index 000000000..b5000ea7b --- /dev/null +++ b/maxscale.spec @@ -0,0 +1,45 @@ +%define _topdir %(echo $PWD)/ +%define name maxscale +%define release ##RELEASE_TAG## +%define version ##VERSION_TAG## +%define buildroot %{_topdir}/%{name}-%{version}-%{release}root +%define install_path /usr/local/sbin/ + +BuildRoot: %{buildroot} +Summary: maxscale +License: GPL +Name: %{name} +Version: %{version} +Release: %{release} +Source: %{name}-%{version}-%{release}.tar.gz +Prefix: / +Group: Development/Tools +#Requires: +BuildRequires: gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc perl make libtool openssl-devel + +%description +galera-remote-exec + +%prep + +%setup -q + +%build +make ROOT_PATH=`pwd` MARIADB_SRC_PATH=/home/skysql/mariadb-5.5.32 depend +make ROOT_PATH=`pwd` MARIADB_SRC_PATH=/home/skysql/mariadb-5.5.32 +make DEST=`pwd`/binaries ROOT_PATH=`pwd` MARIADB_SRC_PATH=/home/skysql/mariadb-5.5.32 install + +%post + +%install +mkdir -p $RPM_BUILD_ROOT%{install_path} +cp -r binaries/* $RPM_BUILD_ROOT%{install_path} + +%clean + +%files +%defattr(-,root,root) +%{install_path} + +%changelog + diff --git a/server/Makefile b/server/Makefile index 007c9c68e..edde5eab7 100644 --- a/server/Makefile +++ b/server/Makefile @@ -59,7 +59,7 @@ install: @mkdir -p $(DEST)/lib @mkdir -p $(DEST)/Documentation install MaxScale.cnf $(DEST)/MaxScale/etc - install Documentation/*.pdf $(DEST)/Documentation + install ../Documentation/*.pdf $(DEST)/Documentation (cd core; make DEST=$(DEST) install) (cd modules/routing; make DEST=$(DEST) install) (cd modules/protocol; make DEST=$(DEST) install) diff --git a/server/core/depend.mk b/server/core/depend.mk index c7cae395b..e1b039f88 100644 --- a/server/core/depend.mk +++ b/server/core/depend.mk @@ -2,7 +2,7 @@ atomic.o: atomic.c buffer.o: buffer.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/bits/byteswap.h /usr/include/sys/types.h \ @@ -18,7 +18,7 @@ spinlock.o: spinlock.c ../include/spinlock.h ../include/thread.h \ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \ /usr/include/sched.h /usr/include/bits/types.h \ /usr/include/bits/typesizes.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/time.h /usr/include/bits/sched.h /usr/include/bits/time.h \ /usr/include/xlocale.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/setjmp.h ../include/atomic.h @@ -26,10 +26,10 @@ gateway.o: gateway.c ../include/gw.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/bits/byteswap.h /usr/include/xlocale.h /usr/include/errno.h \ @@ -63,34 +63,35 @@ gateway.o: gateway.c ../include/gw.h /usr/include/stdio.h \ /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h \ /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h \ /usr/include/sys/ttydefaults.h /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ ../include/gateway_mysql.h ../include/dcb.h ../include/spinlock.h \ ../include/thread.h /usr/include/pthread.h /usr/include/sched.h \ /usr/include/bits/sched.h /usr/include/bits/setjmp.h ../include/buffer.h \ ../include/gwbitmask.h ../include/mysql_protocol.h ../include/dcb.h \ ../include/service.h ../include/server.h ../include/session.h \ ../include/modules.h ../include/config.h ../include/poll.h \ - /usr/include/mysql/mysql.h /usr/include/mysql/mysql_version.h \ - /usr/include/mysql/mysql_com.h /usr/include/mysql/mysql_time.h \ - /usr/include/mysql/my_list.h /usr/include/mysql/typelib.h \ - /usr/include/mysql/my_alloc.h /usr/include/sys/stat.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ - /usr/include/assert.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + /home/skysql/mariadb-5.5.32/include/mysql.h \ + /home/skysql/mariadb-5.5.32/include/mysql_version.h \ + /home/skysql/mariadb-5.5.32/include/mysql_com.h \ + /home/skysql/mariadb-5.5.32/include/mysql_time.h \ + /home/skysql/mariadb-5.5.32/include/my_list.h \ + /home/skysql/mariadb-5.5.32/include/typelib.h \ + /home/skysql/mariadb-5.5.32/include/my_alloc.h ../include/monitor.h \ + /usr/include/sys/stat.h /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ + /usr/include/assert.h /home/skysql/workspace/log_manager/log_manager.h gateway_mysql_protocol.o: gateway_mysql_protocol.c ../include/gw.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/bits/byteswap.h /usr/include/xlocale.h /usr/include/errno.h \ @@ -124,7 +125,7 @@ gateway_mysql_protocol.o: gateway_mysql_protocol.c ../include/gw.h \ /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h \ /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h \ /usr/include/sys/ttydefaults.h /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ ../include/gateway_mysql.h ../include/dcb.h ../include/spinlock.h \ ../include/thread.h /usr/include/pthread.h /usr/include/sched.h \ /usr/include/bits/sched.h /usr/include/bits/setjmp.h ../include/buffer.h \ @@ -136,10 +137,10 @@ gw_utils.o: gw_utils.c ../include/gw.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/bits/byteswap.h /usr/include/xlocale.h /usr/include/errno.h \ @@ -173,7 +174,7 @@ gw_utils.o: gw_utils.c ../include/gw.h /usr/include/stdio.h \ /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h \ /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h \ /usr/include/sys/ttydefaults.h /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ ../include/gateway_mysql.h ../include/dcb.h ../include/spinlock.h \ ../include/thread.h /usr/include/pthread.h /usr/include/sched.h \ /usr/include/bits/sched.h /usr/include/bits/setjmp.h ../include/buffer.h \ @@ -183,10 +184,10 @@ utils.o: utils.c ../include/gw.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/bits/byteswap.h /usr/include/xlocale.h /usr/include/errno.h \ @@ -220,7 +221,7 @@ utils.o: utils.c ../include/gw.h /usr/include/stdio.h \ /usr/include/linux/ioctl.h /usr/include/asm/ioctl.h \ /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h \ /usr/include/sys/ttydefaults.h /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ ../include/gateway_mysql.h ../include/dcb.h ../include/spinlock.h \ ../include/thread.h /usr/include/pthread.h /usr/include/sched.h \ /usr/include/bits/sched.h /usr/include/bits/setjmp.h ../include/buffer.h \ @@ -229,22 +230,20 @@ utils.o: utils.c ../include/gw.h /usr/include/stdio.h \ /usr/include/openssl/sha.h /usr/include/openssl/e_os2.h \ /usr/include/openssl/opensslconf.h \ /usr/include/openssl/opensslconf-x86_64.h ../include/poll.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ - /usr/include/assert.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ + /usr/include/assert.h /home/skysql/workspace/log_manager/log_manager.h dcb.o: dcb.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -284,21 +283,19 @@ dcb.o: dcb.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/asm/ioctl.h /usr/include/asm-generic/ioctl.h \ /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h \ /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ ../include/gateway_mysql.h ../include/mysql_protocol.h ../include/dcb.h \ ../include/poll.h ../include/atomic.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ - /usr/include/assert.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ + /usr/include/assert.h /home/skysql/workspace/log_manager/log_manager.h load_utils.o: load_utils.c /usr/include/sys/param.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/limits.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/syslimits.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \ /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h /usr/include/bits/posix1_lim.h \ @@ -307,14 +304,14 @@ load_utils.o: load_utils.c /usr/include/sys/param.h \ /usr/include/asm/param.h /usr/include/asm-generic/param.h \ /usr/include/sys/types.h /usr/include/bits/types.h \ /usr/include/bits/typesizes.h /usr/include/time.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/bits/byteswap.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ /usr/include/bits/pthreadtypes.h /usr/include/stdio.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/alloca.h \ @@ -325,22 +322,20 @@ load_utils.o: load_utils.c /usr/include/sys/param.h \ ../include/dcb.h ../include/spinlock.h ../include/thread.h \ /usr/include/pthread.h /usr/include/sched.h /usr/include/bits/sched.h \ /usr/include/bits/setjmp.h ../include/buffer.h ../include/gwbitmask.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ - /usr/include/assert.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ + /usr/include/assert.h /home/skysql/workspace/log_manager/log_manager.h session.o: session.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -360,10 +355,10 @@ session.o: session.c /usr/include/stdio.h /usr/include/features.h \ service.o: service.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -379,24 +374,23 @@ service.o: service.c /usr/include/stdio.h /usr/include/features.h \ ../include/gwbitmask.h ../include/server.h ../include/router.h \ ../include/modules.h ../include/users.h ../include/hashtable.h \ ../include/atomic.h ../include/dbusers.h ../include/poll.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ /usr/include/assert.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + /home/skysql/workspace/log_manager/log_manager.h server.o: server.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -409,25 +403,23 @@ server.o: server.c /usr/include/stdio.h /usr/include/features.h \ ../include/server.h ../include/dcb.h ../include/spinlock.h \ ../include/thread.h /usr/include/pthread.h /usr/include/sched.h \ /usr/include/bits/sched.h /usr/include/bits/setjmp.h ../include/buffer.h \ - ../include/gwbitmask.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ + ../include/gwbitmask.h /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ /usr/include/assert.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + /home/skysql/workspace/log_manager/log_manager.h poll.o: poll.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/string.h /usr/include/xlocale.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ @@ -447,10 +439,10 @@ poll.o: poll.c /usr/include/stdio.h /usr/include/features.h \ config.o: config.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/string.h /usr/include/xlocale.h /usr/include/stdlib.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ @@ -465,24 +457,23 @@ config.o: config.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/bits/setjmp.h ../include/dcb.h ../include/buffer.h \ ../include/gwbitmask.h ../include/server.h ../include/users.h \ ../include/hashtable.h ../include/atomic.h ../include/monitor.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ /usr/include/assert.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + /home/skysql/workspace/log_manager/log_manager.h users.o: users.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -499,10 +490,10 @@ users.o: users.c /usr/include/stdio.h /usr/include/features.h \ hashtable.o: hashtable.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -519,37 +510,39 @@ hashtable.o: hashtable.c /usr/include/stdio.h /usr/include/features.h \ dbusers.o: dbusers.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ - /usr/include/mysql/mysql.h /usr/include/sys/types.h /usr/include/time.h \ - /usr/include/endian.h /usr/include/bits/endian.h \ + /home/skysql/mariadb-5.5.32/include/mysql.h /usr/include/sys/types.h \ + /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/bits/byteswap.h /usr/include/sys/select.h \ /usr/include/bits/select.h /usr/include/bits/sigset.h \ /usr/include/bits/time.h /usr/include/sys/sysmacros.h \ - /usr/include/bits/pthreadtypes.h /usr/include/mysql/mysql_version.h \ - /usr/include/mysql/mysql_com.h /usr/include/mysql/mysql_time.h \ - /usr/include/mysql/my_list.h /usr/include/mysql/typelib.h \ - /usr/include/mysql/my_alloc.h ../include/dcb.h ../include/spinlock.h \ - ../include/thread.h /usr/include/pthread.h /usr/include/sched.h \ - /usr/include/bits/sched.h /usr/include/xlocale.h \ + /usr/include/bits/pthreadtypes.h \ + /home/skysql/mariadb-5.5.32/include/mysql_version.h \ + /home/skysql/mariadb-5.5.32/include/mysql_com.h \ + /home/skysql/mariadb-5.5.32/include/mysql_time.h \ + /home/skysql/mariadb-5.5.32/include/my_list.h \ + /home/skysql/mariadb-5.5.32/include/typelib.h \ + /home/skysql/mariadb-5.5.32/include/my_alloc.h ../include/dcb.h \ + ../include/spinlock.h ../include/thread.h /usr/include/pthread.h \ + /usr/include/sched.h /usr/include/bits/sched.h /usr/include/xlocale.h \ /usr/include/bits/setjmp.h ../include/buffer.h ../include/gwbitmask.h \ ../include/service.h ../include/server.h ../include/users.h \ ../include/hashtable.h ../include/atomic.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ /usr/include/assert.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h \ - ../include/secrets.h /usr/include/string.h /usr/include/stdlib.h \ + /home/skysql/workspace/log_manager/log_manager.h ../include/secrets.h \ + /usr/include/string.h /usr/include/stdlib.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ /usr/include/alloca.h /usr/include/sys/stat.h /usr/include/bits/stat.h \ /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/errno.h \ @@ -565,14 +558,14 @@ thread.o: thread.c ../include/thread.h /usr/include/pthread.h \ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \ /usr/include/sched.h /usr/include/bits/types.h \ /usr/include/bits/typesizes.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/time.h /usr/include/bits/sched.h /usr/include/bits/time.h \ /usr/include/xlocale.h /usr/include/bits/pthreadtypes.h \ /usr/include/bits/setjmp.h gwbitmask.o: gwbitmask.c /usr/include/stdlib.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ /usr/include/endian.h /usr/include/bits/endian.h \ /usr/include/bits/byteswap.h /usr/include/sys/types.h \ @@ -587,10 +580,10 @@ gwbitmask.o: gwbitmask.c /usr/include/stdlib.h /usr/include/features.h \ monitor.o: monitor.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -604,24 +597,23 @@ monitor.o: monitor.c /usr/include/stdio.h /usr/include/features.h \ ../include/thread.h /usr/include/pthread.h /usr/include/sched.h \ /usr/include/bits/sched.h /usr/include/bits/setjmp.h ../include/buffer.h \ ../include/gwbitmask.h ../include/modules.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ /usr/include/assert.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + /home/skysql/workspace/log_manager/log_manager.h adminusers.o: adminusers.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -637,24 +629,21 @@ adminusers.o: adminusers.c /usr/include/stdio.h /usr/include/features.h \ ../include/thread.h /usr/include/pthread.h /usr/include/sched.h \ /usr/include/bits/sched.h /usr/include/bits/setjmp.h ../include/atomic.h \ ../include/dcb.h ../include/buffer.h ../include/gwbitmask.h \ - ../include/adminusers.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ - /usr/include/assert.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + ../include/adminusers.h /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ + /usr/include/assert.h /home/skysql/workspace/log_manager/log_manager.h secrets.o: secrets.c ../include/secrets.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/string.h /usr/include/xlocale.h /usr/include/stdlib.h \ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \ @@ -670,17 +659,15 @@ secrets.o: secrets.c ../include/secrets.h /usr/include/stdio.h \ /usr/include/asm-generic/errno-base.h /usr/include/openssl/aes.h \ /usr/include/openssl/opensslconf.h \ /usr/include/openssl/opensslconf-x86_64.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ /usr/include/assert.h /usr/include/pthread.h /usr/include/sched.h \ /usr/include/bits/sched.h /usr/include/bits/setjmp.h \ /usr/include/unistd.h /usr/include/bits/posix_opt.h \ /usr/include/bits/environments.h /usr/include/bits/confname.h \ - /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h \ + /usr/include/getopt.h /home/skysql/workspace/log_manager/log_manager.h \ /usr/include/ctype.h diff --git a/server/modules/monitor/depend.mk b/server/modules/monitor/depend.mk index 653e9c7e6..362a8edd6 100644 --- a/server/modules/monitor/depend.mk +++ b/server/modules/monitor/depend.mk @@ -1,10 +1,10 @@ mysql_mon.o: mysql_mon.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -18,25 +18,27 @@ mysql_mon.o: mysql_mon.c /usr/include/stdio.h /usr/include/features.h \ ../../include/thread.h /usr/include/pthread.h /usr/include/sched.h \ /usr/include/bits/sched.h /usr/include/bits/setjmp.h \ ../../include/buffer.h ../../include/gwbitmask.h mysqlmon.h \ - /usr/include/mysql/mysql.h /usr/include/mysql/mysql_version.h \ - /usr/include/mysql/mysql_com.h /usr/include/mysql/mysql_time.h \ - /usr/include/mysql/my_list.h /usr/include/mysql/typelib.h \ - /usr/include/mysql/my_alloc.h /usr/include/mysql/mysqld_error.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ + /home/skysql/mariadb-5.5.32/include/mysql.h \ + /home/skysql/mariadb-5.5.32/include/mysql_version.h \ + /home/skysql/mariadb-5.5.32/include/mysql_com.h \ + /home/skysql/mariadb-5.5.32/include/mysql_time.h \ + /home/skysql/mariadb-5.5.32/include/my_list.h \ + /home/skysql/mariadb-5.5.32/include/typelib.h \ + /home/skysql/mariadb-5.5.32/include/my_alloc.h \ + /home/skysql/mariadb-5.5.32/include/mysqld_error.h \ + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ /usr/include/assert.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h \ - ../../include/secrets.h /usr/include/sys/stat.h /usr/include/bits/stat.h \ - /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/errno.h \ - /usr/include/bits/errno.h /usr/include/linux/errno.h \ - /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \ - /usr/include/asm-generic/errno-base.h /usr/include/openssl/aes.h \ - /usr/include/openssl/opensslconf.h \ + /home/skysql/workspace/log_manager/log_manager.h ../../include/secrets.h \ + /usr/include/sys/stat.h /usr/include/bits/stat.h /usr/include/fcntl.h \ + /usr/include/bits/fcntl.h /usr/include/errno.h /usr/include/bits/errno.h \ + /usr/include/linux/errno.h /usr/include/asm/errno.h \ + /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \ + /usr/include/openssl/aes.h /usr/include/openssl/opensslconf.h \ /usr/include/openssl/opensslconf-x86_64.h diff --git a/server/modules/protocol/depend.mk b/server/modules/protocol/depend.mk index 79a4eaaaa..e85c9a298 100644 --- a/server/modules/protocol/depend.mk +++ b/server/modules/protocol/depend.mk @@ -2,10 +2,10 @@ mysql_client.o: mysql_client.c ../include/mysql_client_server_protocol.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -31,7 +31,7 @@ mysql_client.o: mysql_client.c ../include/mysql_client_server_protocol.h \ /usr/include/asm/sockios.h /usr/include/asm-generic/sockios.h \ /usr/include/netinet/in.h /usr/include/bits/in.h \ /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/bits/stat.h \ /usr/include/unistd.h /usr/include/bits/posix_opt.h \ /usr/include/bits/environments.h /usr/include/bits/confname.h \ @@ -45,10 +45,10 @@ mysql_common.o: mysql_common.c ../include/mysql_client_server_protocol.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -74,7 +74,7 @@ mysql_common.o: mysql_common.c ../include/mysql_client_server_protocol.h \ /usr/include/asm/sockios.h /usr/include/asm-generic/sockios.h \ /usr/include/netinet/in.h /usr/include/bits/in.h \ /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/bits/stat.h \ /usr/include/unistd.h /usr/include/bits/posix_opt.h \ /usr/include/bits/environments.h /usr/include/bits/confname.h \ @@ -89,10 +89,10 @@ mysql_backend.o: mysql_backend.c \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -118,7 +118,7 @@ mysql_backend.o: mysql_backend.c \ /usr/include/asm/sockios.h /usr/include/asm-generic/sockios.h \ /usr/include/netinet/in.h /usr/include/bits/in.h \ /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/bits/stat.h \ /usr/include/unistd.h /usr/include/bits/posix_opt.h \ /usr/include/bits/environments.h /usr/include/bits/confname.h \ @@ -132,10 +132,10 @@ mysql_common.o: mysql_common.c ../include/mysql_client_server_protocol.h \ /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -161,7 +161,7 @@ mysql_common.o: mysql_common.c ../include/mysql_client_server_protocol.h \ /usr/include/asm/sockios.h /usr/include/asm-generic/sockios.h \ /usr/include/netinet/in.h /usr/include/bits/in.h \ /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/bits/stat.h \ /usr/include/unistd.h /usr/include/bits/posix_opt.h \ /usr/include/bits/environments.h /usr/include/bits/confname.h \ @@ -174,10 +174,10 @@ mysql_common.o: mysql_common.c ../include/mysql_client_server_protocol.h \ telnetd.o: telnetd.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -218,17 +218,17 @@ telnetd.o: telnetd.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \ /usr/include/bits/sigstack.h /usr/include/sys/ucontext.h \ /usr/include/bits/sigthread.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ ../../include/gateway_mysql.h ../../include/mysql_protocol.h \ ../../include/dcb.h ../include/telnetd.h ../../include/adminusers.h httpd.o: httpd.c ../include/httpd.h /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -269,6 +269,6 @@ httpd.o: httpd.c ../include/httpd.h /usr/include/stdio.h \ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \ /usr/include/bits/sigstack.h /usr/include/sys/ucontext.h \ /usr/include/bits/sigthread.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ ../../include/gateway_mysql.h ../../include/mysql_protocol.h \ ../../include/dcb.h diff --git a/server/modules/routing/depend.mk b/server/modules/routing/depend.mk index d774cd963..85c4d7793 100644 --- a/server/modules/routing/depend.mk +++ b/server/modules/routing/depend.mk @@ -1,10 +1,10 @@ testroute.o: testroute.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ ../../include/router.h ../../include/service.h /usr/include/time.h \ /usr/include/bits/time.h /usr/include/xlocale.h ../../include/spinlock.h \ @@ -18,10 +18,10 @@ readconnroute.o: readconnroute.c /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -36,19 +36,17 @@ readconnroute.o: readconnroute.c /usr/include/stdio.h \ /usr/include/bits/setjmp.h ../../include/dcb.h ../../include/buffer.h \ ../../include/gwbitmask.h ../../include/server.h ../../include/router.h \ ../../include/session.h ../../include/atomic.h \ - ../include/readconnection.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ + ../include/readconnection.h /home/skysql/workspace/utils/skygw_types.h \ /usr/include/math.h /usr/include/bits/huge_val.h \ /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ /usr/include/bits/inf.h /usr/include/bits/nan.h \ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ - /usr/include/assert.h /usr/include/unistd.h \ - /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ - /usr/include/bits/confname.h /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h \ + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h \ + /home/skysql/workspace/utils/skygw_debug.h /usr/include/assert.h \ + /usr/include/unistd.h /usr/include/bits/posix_opt.h \ + /usr/include/bits/environments.h /usr/include/bits/confname.h \ + /usr/include/getopt.h /home/skysql/workspace/log_manager/log_manager.h \ ../include/mysql_client_server_protocol.h /usr/include/stdint.h \ /usr/include/bits/wchar.h /usr/include/openssl/sha.h \ /usr/include/openssl/e_os2.h /usr/include/openssl/opensslconf.h \ @@ -66,16 +64,16 @@ readconnroute.o: readconnroute.c /usr/include/stdio.h \ /usr/include/asm/sockios.h /usr/include/asm-generic/sockios.h \ /usr/include/netinet/in.h /usr/include/bits/in.h \ /usr/include/arpa/inet.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdbool.h \ /usr/include/fcntl.h /usr/include/bits/fcntl.h /usr/include/bits/stat.h \ ../../include/poll.h ../../include/users.h ../../include/hashtable.h debugcli.o: debugcli.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -91,24 +89,23 @@ debugcli.o: debugcli.c /usr/include/stdio.h /usr/include/features.h \ ../../include/gwbitmask.h ../../include/server.h ../../include/session.h \ ../../include/router.h ../../include/modules.h ../../include/atomic.h \ ../../include/poll.h ../include/debugcli.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ /usr/include/assert.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h + /home/skysql/workspace/log_manager/log_manager.h debugcmd.o: debugcmd.c /usr/include/stdio.h /usr/include/features.h \ /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/stdlib.h /usr/include/bits/waitflags.h \ /usr/include/bits/waitstatus.h /usr/include/endian.h \ @@ -125,4 +122,4 @@ debugcmd.o: debugcmd.c /usr/include/stdio.h /usr/include/features.h \ ../../include/router.h ../../include/modules.h ../../include/atomic.h \ ../../include/poll.h ../../include/users.h ../../include/hashtable.h \ ../../include/dbusers.h ../../include/config.h ../include/telnetd.h \ - ../../include/adminusers.h ../include/debugcli.h + ../../include/adminusers.h ../../include/monitor.h ../include/debugcli.h diff --git a/server/modules/routing/readwritesplit/depend.mk b/server/modules/routing/readwritesplit/depend.mk index fd00e3b1a..8e3fa1868 100644 --- a/server/modules/routing/readwritesplit/depend.mk +++ b/server/modules/routing/readwritesplit/depend.mk @@ -2,10 +2,10 @@ readwritesplit.o: readwritesplit.c /usr/include/stdio.h \ /usr/include/features.h /usr/include/sys/cdefs.h \ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ /usr/include/gnu/stubs-64.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \ /usr/include/bits/types.h /usr/include/bits/typesizes.h \ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \ - /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \ /usr/include/strings.h /usr/include/xlocale.h /usr/include/string.h \ ../../../include/router.h ../../../include/service.h /usr/include/time.h \ @@ -21,23 +21,22 @@ readwritesplit.o: readwritesplit.c /usr/include/stdio.h \ /usr/include/bits/waitstatus.h /usr/include/sys/types.h \ /usr/include/sys/select.h /usr/include/bits/select.h \ /usr/include/bits/sigset.h /usr/include/sys/sysmacros.h \ - /usr/include/alloca.h /packages/mariadb-5.5.25/include/mysql.h \ - /packages/mariadb-5.5.25/include/mysql_version.h \ - /packages/mariadb-5.5.25/include/mysql_com.h \ - /packages/mariadb-5.5.25/include/mysql_time.h \ - /packages/mariadb-5.5.25/include/my_list.h \ - /packages/mariadb-5.5.25/include/typelib.h \ - /packages/mariadb-5.5.25/include/my_alloc.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_utils.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_types.h \ - /usr/include/math.h /usr/include/bits/huge_val.h \ - /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \ - /usr/include/bits/inf.h /usr/include/bits/nan.h \ - /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \ - /home/mriddoch/Repository/skygateway/utils/skygw_debug.h \ + /usr/include/alloca.h /home/skysql/mariadb-5.5.32/include/mysql.h \ + /home/skysql/mariadb-5.5.32/include/mysql_version.h \ + /home/skysql/mariadb-5.5.32/include/mysql_com.h \ + /home/skysql/mariadb-5.5.32/include/mysql_time.h \ + /home/skysql/mariadb-5.5.32/include/my_list.h \ + /home/skysql/mariadb-5.5.32/include/typelib.h \ + /home/skysql/mariadb-5.5.32/include/my_alloc.h \ + /home/skysql/workspace/utils/skygw_utils.h \ + /home/skysql/workspace/utils/skygw_types.h /usr/include/math.h \ + /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \ + /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \ + /usr/include/bits/nan.h /usr/include/bits/mathdef.h \ + /usr/include/bits/mathcalls.h /home/skysql/workspace/utils/skygw_debug.h \ /usr/include/assert.h /usr/include/unistd.h \ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \ /usr/include/bits/confname.h /usr/include/getopt.h \ - /home/mriddoch/Repository/skygateway/log_manager/log_manager.h \ - /home/mriddoch/Repository/skygateway/query_classifier/query_classifier.h \ - /home/mriddoch/Repository/skygateway/query_classifier/../utils/skygw_utils.h + /home/skysql/workspace/log_manager/log_manager.h \ + /home/skysql/workspace/query_classifier/query_classifier.h \ + /home/skysql/workspace/query_classifier/../utils/skygw_utils.h