diff --git a/src/Makefile.am b/src/Makefile.am index 3122829..fb6d395 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,31 +1,32 @@ MAINTAINERCLEANFILES = Makefile.in AM_CFLAGS = -fPIC -Werror AM_CPPFLAGS = -I$(top_builddir)/include sbin_PROGRAMS = boothd boothd_SOURCES = config.c main.c paxos.c ticket.c transport.c \ pacemaker.c paxos_lease.c timer.c +boothd_LDLIBS = -lplumb boothd_LDFLAGS = $(OS_DYFLAGS) -L./ boothd_CPPFLAGS = $(GLIB_CFLAGS) noinst_HEADERS = booth.h list.h pacemaker.h paxos_lease.h timer.h \ config.h log.h paxos.h ticket.h transport.h if HAVE_HELP2MAN man_MANS = booth.8 boothd.8 MAINTAINERCLEANFILES += $(man_MANS) EXTRA_DIST = $(man_MANS) %.8: % $(HELP2MAN) -s 8 -N -o $@ ./$< booth.8: boothd.8 cp $< $@ endif lint: -splint $(INCLUDES) $(LINT_FLAGS) $(CFLAGS) *.c diff --git a/tools/Makefile.am b/tools/Makefile.am index 344a237..e8000e5 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,40 +1,43 @@ # Copyright (C) 2012, NIPPON TELEGRAPH AND TELEPHONE CORPORATION # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA MAINTAINERCLEANFILES = Makefile.in INCLUDES = -I/usr/include/pacemaker \ -I/usr/include/heartbeat \ -I/usr/include/libxml2 \ -I$(srcdir) if RESOURCE_MONITOR noinst_HEADERS = booth_resource_monitord.h sbin_PROGRAMS = booth_resource_monitord # BUILD booth_resource_monitord_SOURCES = booth_resource_monitord.c booth_resource_monitord_LDADD = -lcrmcommon \ -lcrmcluster \ -lpe_status \ - -lcib + -lcib \ + -lglib-2.0 \ + -lqb \ + -lxml2 booth_resource_monitord_CPPFLAGS = $(GLIB_CFLAGS) endif AM_CFLAGS = -Wall -Werror