add some support for controlling Linux or AIX in the makefile

this should really be done by configure

(This used to be ctdb commit 5a855599288995659e81f1bdbed157bdb207f94a)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 2891a2248cf9dc6d8cc145b98a356945215fa183..dbd650e6db40acddc38ee9ac39307fa791c77f79 100644 (file)
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -1,5 +1,12 @@
 #!gmake
 #
+# Linux
+CTDB_SYSTEM_OBJ = common/system_linux.o
+SCSI_IO = bin/scsi_io
+# AIX
+#CTDB_SYSTEM_OBJ = common/system_aix.o
+#PCAP_LIB = -lpcap
+
 CC = @CC@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -28,14 +35,14 @@ CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        -DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
        -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
 
-LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@
+LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ $(PCAP_LIB)
 
 UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util.o \
        lib/util/util_time.o lib/util/util_file.o
 
 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/system.o
+       lib/util/debug.o $(CTDB_SYSTEM_OBJ)
 
 CTDB_TCP_OBJ = tcp/tcp_connect.o tcp/tcp_io.o tcp/tcp_init.o
 
@@ -51,7 +58,7 @@ CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o server/ctdb_lockwait.o \
        $(CTDB_CLIENT_OBJ) $(CTDB_TCP_OBJ) @INFINIBAND_WRAPPER_OBJ@
 
 TEST_BINS=bin/ctdb_bench bin/ctdb_fetch bin/ctdb_store @INFINIBAND_BINS@
-BINS = bin/ctdb bin/scsi_io
+BINS = bin/ctdb $(SCSI_IO)
 SBINS = bin/ctdbd
 
 DIRS = lib bin

diff --git a/ctdb/common/system.c b/ctdb/common/system_linux.c
similarity index 99%
rename from ctdb/common/system.c
rename to ctdb/common/system_linux.c
index e9015731489cc3930ad5f1ff01655d2e891d6fd8..2262ccdd5751879015940b6f0e56d82af6d13809 100644 (file)
--- a/ctdb/common/system.c
+++ b/ctdb/common/system_linux.c
@@ -1,5 +1,5 @@
 /* 
-   ctdb system specific code to manage raw sockets
+   ctdb system specific code to manage raw sockets on linux
 
    Copyright (C) Ronnie Sahlberg  2007
    Copyright (C) Andrew Tridgell  2007