diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-06-07 22:16:48 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-06-07 22:16:48 +1000 |
| commit | b50096c8355e3e5890d3535ab955afe27d036cfb (patch) | |
| tree | 711cbba432a484f53d5432e4d1b753e8b63d282e /ctdb/Makefile.in | |
| parent | ae3d54094bab1aa79143912609ea35fb1dcb79da (diff) | |
| download | samba-b50096c8355e3e5890d3535ab955afe27d036cfb.tar.gz samba-b50096c8355e3e5890d3535ab955afe27d036cfb.tar.xz samba-b50096c8355e3e5890d3535ab955afe27d036cfb.zip | |
more code rearrangement
(This used to be ctdb commit 2bcf3b16163041f03add2e5bf9f1f5fb3599ec24)
Diffstat (limited to 'ctdb/Makefile.in')
| -rw-r--r-- | ctdb/Makefile.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index f288f27e7da..ee504d037d2 100644 --- a/ctdb/Makefile.in +++ b/ctdb/Makefile.in @@ -22,7 +22,8 @@ POPT_OBJ = @POPT_OBJ@ CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \ -I@tallocdir@ -I@tdbdir@/include -I@libreplacedir@ \ - -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS) + -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \ + -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS) LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ @@ -35,14 +36,15 @@ CTDB_COMMON_OBJ = common/ctdb_io.o common/util.o common/ctdb_util.o \ CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o CTDB_CLIENT_OBJ = client/ctdb_client.o \ - $(CTDB_COMMON_OBJ) $(POPT_OBJ) $(UTIL_OBJ) @TALLOC_OBJ@ @TDB_OBJ@ @LIBREPLACEOBJ@ \ - $(EXTRA_OBJ) @EVENTS_OBJ@ + $(CTDB_COMMON_OBJ) $(POPT_OBJ) $(UTIL_OBJ) @TALLOC_OBJ@ @TDB_OBJ@ \ + @LIBREPLACEOBJ@ $(EXTRA_OBJ) @EVENTS_OBJ@ CTDB_TAKEOVER_OBJ = takeover/system.o takeover/ctdb_takeover.o -CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o server/ctdb_recoverd.o \ - server/ctdb_recover.o server/ctdb_freeze.o server/ctdb_tunables.o server/ctdb_monitor.o \ - server/ctdb.o server/ctdb_control.o server/ctdb_call.o server/ctdb_ltdb_server.o \ +CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \ + server/ctdb_recoverd.o server/ctdb_recover.o server/ctdb_freeze.o \ + server/ctdb_tunables.o server/ctdb_monitor.o server/ctdb_server.o \ + server/ctdb_control.o server/ctdb_call.o server/ctdb_ltdb_server.o \ server/ctdb_traverse.o $(CTDB_CLIENT_OBJ) \ $(CTDB_TAKEOVER_OBJ) $(CTDB_TCP_OBJ) @INFINIBAND_WRAPPER_OBJ@ @@ -71,9 +73,9 @@ bin/ctdbd: $(CTDB_SERVER_OBJ) @echo Linking $@ @$(CC) $(CFLAGS) -o $@ $(CTDB_SERVER_OBJ) $(LIB_FLAGS) -bin/ctdb: $(OBJS) tools/ctdb_control.o +bin/ctdb: $(CLIENT_OBJS) tools/ctdb.o @echo Linking $@ - @$(CC) $(CFLAGS) -o $@ tools/ctdb_control.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) + @$(CC) $(CFLAGS) -o $@ tools/ctdb.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) bin/ctdb_bench: $(CTDB_CLIENT_OBJ) tests/ctdb_bench.o @echo Linking $@ @@ -88,7 +90,7 @@ bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o @$(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS) clean: - rm -f *.o */*.o */*/*.o + rm -f *.o */*.o */*/*.o */*~ rm -f $(BINS) $(SBINS) $(TEST_BINS) distclean: clean |