Barak A. Pearlmutter

merge branch 'tweaks'

... ... @@ -44,8 +44,8 @@ tmp
# autotools build debris
/.deps/
/Makefile
/Makefile.in
Makefile
Makefile.in
/aclocal.m4
/autom4te.cache/
/compile
... ... @@ -59,6 +59,7 @@ tmp
/install-sh
/libtool
/ltmain.sh
/m4/
/missing
/pkgconfig/libclsync.pc
/stamp-h1
... ...
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = examples
if CLSYNC
bin_PROGRAMS = clsync
clsync_SOURCES = sync.c cluster.c main.c error.c fileutils.c malloc.c glibex.c indexes.c calc.c
clsync_SOURCES = calc.c cluster.c error.c fileutils.c glibex.c \
indexes.c main.c malloc.c sync.c cluster.h fileutils.h \
glibex.h main.h sync.h common.h control.h
clsync_CFLAGS = $(AM_CFLAGS)
if HAVE_KQUEUE
... ... @@ -35,16 +40,12 @@ endif
main.o: revision.h
man_MANS = man/man1/clsync.1
exampledir=$(docdir)/examples
example_DATA = \
$(wildcard $(srcdir)/examples/*.c) \
$(wildcard $(srcdir)/examples/*.sh)
dist_man_MANS = man/man1/clsync.1
endif
doc_DATA = CONTRIB DEVELOPING LICENSE PROTOCOL README.md TODO
dist_doc_DATA = CONTRIB DEVELOPING LICENSE PROTOCOL README.md TODO
EXTRA_DIST = .doxygen .travis.sh .travis.yml NOTES SHORTHANDS debian gentoo
if LIBCLSYNC
lib_LTLIBRARIES = libclsync.la
... ... @@ -92,19 +93,10 @@ endif
doc:
doxygen .doxygen
install-data-local:
if LIBCLSYNC
mkdir -p $(DESTDIR)/$(libdir)/pkgconfig
cp pkgconfig/*.pc $(DESTDIR)/$(libdir)/pkgconfig/
endif
if CLSYNC
mkdir -p $(DESTDIR)/$(exampledir)
cp -R examples/production $(DESTDIR)/$(exampledir)/
if SOCKET
pkgconfig_DATA = pkgconfig/libclsync.pc
endif
uninstall-local:
rm -rf $(DESTDIR)/$(exampledir)/production
CLEANFILES = revision.h
if CLSYNC
CLEANFILES += examples/rules
... ...
... ... @@ -4,6 +4,7 @@
AC_PREREQ([2.59])
AC_INIT([clsync],[0.3],[Dmitry Yu Okunev <dyokunev@ut.mephi.ru>],,[https://github.com/xaionaro/clsync])
AC_CONFIG_SRCDIR([sync.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 foreign -Wall -Wno-portability])
AC_CONFIG_HEADERS([config.h])
AM_PROG_CC_C_O
... ... @@ -12,6 +13,8 @@ AC_CONFIG_MACRO_DIR([m4])
LT_INIT
PKG_INSTALLDIR
AC_CANONICAL_HOST
case $host_os in
*bsd*)
... ... @@ -288,5 +291,5 @@ AM_CPPFLAGS="${GLIB_CFLAGS}"
AC_SUBST(AM_CPPFLAGS)
AC_CONFIG_FILES([Makefile pkgconfig/libclsync.pc])
AC_CONFIG_FILES([Makefile examples/Makefile pkgconfig/libclsync.pc])
AC_OUTPUT
... ...
exampledir=$(docdir)/examples
# example_DATA = \
# $(wildcard $(srcdir)/*.c) \
# $(wildcard $(srcdir)/*.sh)
dist_example_DATA = clsync-synchandler-rsyncso.c clsync-synchandler-so.c
dist_example_SCRIPTS = clsync-start-cluster.sh \
clsync-start-rsyncdirect.sh clsync-start-rsyncshell.sh \
clsync-start-rsyncso.sh clsync-start-so.sh \
clsync-synchandler-rsyncshell.sh
# find production -type f -name '*.sh'
nobase_dist_example_SCRIPTS = \
production/etc/clsync/hooks/lxc/exit-backup.sh \
production/etc/clsync/hooks/lxc/exit-brother.sh \
production/etc/clsync/synchandler/lxc/backup.sh \
production/etc/clsync/synchandler/lxc/brother.sh
# find production -type f -not -name '*.sh'
nobase_dist_example_DATA = production/etc/clsync/rules/hpc \
production/etc/clsync/rules/hpc-backup \
production/etc/clsync/rules/lxc \
production/etc/clsync/synchandler/hpc/handler-backup.c \
production/etc/clsync/synchandler/hpc/handler-pdcp.c \
production/etc/clsync/synchandler/lxc/rsync.exclude \
production/etc/clsync/clsync.conf
... ...