sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

libctdb: Ronnie's build changes, so we actually build libctdb with make.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

(This used to be ctdb commit f02526486680db1473bdf10328e8f62a2590c745)
This commit is contained in:
Rusty Russell 2010-05-20 15:57:40 +09:30
parent 1dc7f2c4f8
commit 5db92ccd4d
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ctdb/Makefile.in
View File

@ -2,6 +2,9 @@
CC = @CC@
AR = ar
ARFLAGS = cru
RANLIB = ranlib
prefix = @prefix@
exec_prefix = @exec_prefix@
datarootdir = @datarootdir@
@ -41,7 +44,10 @@ UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util
CTDB_COMMON_OBJ = common/ctdb_io.o common/ctdb_util.o \
common/ctdb_ltdb.o common/ctdb_message.o common/cmdline.o \
lib/util/debug.o common/rb_tree.o @CTDB_SYSTEM_OBJ@ common/system_common.o \
common/ctdb_logging.c
common/ctdb_logging.c libctdb/libctdb.a
CTDB_LIB_OBJ = libctdb/ctdb.o libctdb/io_elem.o libctdb/local_tdb.o \
libctdb/messages.o libctdb/sync.o libctdb/control.o
CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
@ -102,6 +108,12 @@ bin/ctdbd: $(CTDB_SERVER_OBJ)
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS)
libctdb/libctdb.a: $(CTDB_LIB_OBJ)
@echo Linking $@
-rm -f libctdb.a
@$(AR) $(ARFLAGS) libctdb/libctdb.a $(CTDB_LIB_OBJ)
@$(RANLIB) libctdb/libctdb.a
bin/scsi_io: $(CTDB_CLIENT_OBJ) utils/scsi_io/scsi_io.o
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ utils/scsi_io/scsi_io.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
@ -184,7 +196,7 @@ doc: doc/ctdb.1 doc/ctdb.1.html \
doc/onnode.1 doc/onnode.1.html
clean:
rm -f *.o */*.o */*/*.o */*~
rm -f *.o */*.o */*.a */*/*.o */*~
rm -f utils/smnotify/gen_xdr.c
rm -f $(BINS) $(SBINS) $(TEST_BINS)
@ -207,6 +219,7 @@ install: all
${INSTALLCMD} -m 755 bin/ctdbd $(DESTDIR)$(sbindir)
${INSTALLCMD} -m 755 bin/smnotify $(DESTDIR)$(bindir)
$(INSTALLCMD) -m 755 bin/ping_pong $(DESTDIR)$(bindir)
${INSTALLCMD} -m 644 include/ctdb.h $(DESTDIR)$(includedir)
${INSTALLCMD} -m 644 include/ctdb_client.h $(DESTDIR)$(includedir)
${INSTALLCMD} -m 644 include/ctdb_protocol.h $(DESTDIR)$(includedir)
${INSTALLCMD} -m 644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3

1
ctdb/packaging/RPM/ctdb.spec.in
View File

@ -121,6 +121,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ctdb.1.gz
%{_mandir}/man1/ctdbd.1.gz
%{_mandir}/man1/onnode.1.gz
%{_includedir}/ctdb.h
%{_includedir}/ctdb_client.h
%{_includedir}/ctdb_protocol.h
%{_includedir}/ctdb_private.h