crosscompile-ready makefiles/configure scripts for ulogd (Dan Eble)

diff --git a/Rules.make.in b/Rules.make.in
index 4b3fcff4a603946d1bf778bcddd245ca6ad1a8c3..36c0d56648afaa056082828ae914ddc756255e4c 100644 (file)
--- a/Rules.make.in
+++ b/Rules.make.in
@@ -15,6 +15,9 @@ INCIPULOG=-I@top_srcdir@/libipulog/include
 INCCONFFILE=-I@top_srcdir@/conffile
 
 CC=@CC@
+LD=@LD@
+INSTALL=@INSTALL@
+
 CFLAGS=@CFLAGS@ @CPPFLAGS@ 
 CFLAGS+=-DULOGD_CONFIGFILE=\"$(ULOGD_CONFIGFILE)\"
 # doesn't work for subdirs

diff --git a/configure.in b/configure.in
index 5d0d99bfd4e799e6a2ace28afe3ca3b95d8ddc28..1b94de744de421438e27896cb29e4e025ac779d3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,7 @@ AC_INIT(ulogd.c)
 dnl Checks for programs.
 AC_PROG_MAKE_SET
 AC_PROG_CC
+AC_CHECK_TOOL(LD, ld)
 AC_PROG_INSTALL
 
 dnl Checks for libraries.

diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 260e75b8bb620d5f29aa9aeff8ed6acb123361cc..4c41930aa22dd59ca0ab286b8ebb815eb93e4110 100644 (file)
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -15,17 +15,17 @@ all: $(SHARED_LIBS)
 distrib:
 
 $(SHARED_LIBS): %.so: %_sh.o
-       ld -shared -o $@ $< -lc
+       $(LD) -shared -o $@ $< -lc
 
 %_sh.o: %.c
        $(CC) $(SH_CFLAGS) -o $@ -c $<
 
 clean:
-       rm -f $(SHARED_LIBS) *.o
+       $(RM) $(SHARED_LIBS) *.o
 
 distclean:
-       rm -f Makefile
+       $(RM) Makefile
 
 install: all
-       @INSTALL@ -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
-       @INSTALL@ -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
+       $(INSTALL) -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)

diff --git a/libipulog/Makefile.in b/libipulog/Makefile.in
index f5e416e8236d69fd368435afc2b675fbe3afd9fa..52a33944fa8a43b0121f189f2275f89e426e7004 100644 (file)
--- a/libipulog/Makefile.in
+++ b/libipulog/Makefile.in
@@ -4,7 +4,7 @@ include @top_srcdir@/Rules.make
 CFLAGS+=-Iinclude -I/usr/src/linux/include
 
 libipulog.a: libipulog.o
-       ld -i $< -o $@
+       $(LD) -i $< -o $@
 
 distrib:
 
@@ -15,9 +15,9 @@ libipulog.o: libipulog.c
        $(CC) $(CFLAGS) -c $< -o $@
 
 clean:
-       rm -f ulog_test libipulog.o libipulog.a
+       $(RM) ulog_test libipulog.o libipulog.a
 
 distclean: clean
-       rm Makefile
+       $(RM) Makefile
 
 install: libipulog.a

diff --git a/mysql/Makefile.in b/mysql/Makefile.in
index ed6003fadf8291604baeb2efd1d08602a1e28423..cbab8439de411758e92b78aed72882337fc44abd 100644 (file)
--- a/mysql/Makefile.in
+++ b/mysql/Makefile.in
@@ -14,17 +14,17 @@ all: $(SHARED_LIBS)
 distrib:
 
 $(SHARED_LIBS): %.so: %_sh.o
-       ld -shared $(MYSQL_LDFLAGS) -o $@ $< -lc
+       $(LD) -shared $(MYSQL_LDFLAGS) -o $@ $< -lc
 
 %_sh.o: %.c
        $(CC) $(MYSQL_CFLAGS) $(SH_CFLAGS) -o $@ -c $<
        
 clean:
-       rm -f $(SHARED_LIBS) *.o
+       $(RM) $(SHARED_LIBS) *.o
 
 distclean:
-       rm -f Makefile
+       $(RM) Makefile
 
 install: all
-       @INSTALL@ -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
-       @INSTALL@ -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
+       $(INSTALL) -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)

diff --git a/pcap/Makefile.in b/pcap/Makefile.in
index 76d4caac737b0d02108a142cbd634011015f393b..d469c2b64b1481b8b0eef7203ff2dde24b3f41a5 100644 (file)
--- a/pcap/Makefile.in
+++ b/pcap/Makefile.in
@@ -14,17 +14,17 @@ all: $(SHARED_LIBS)
 distrib:
 
 $(SHARED_LIBS): %.so: %_sh.o
-       ld -shared -o $@ $< -lc -lpcap
+       $(LD) -shared -o $@ $< -lc -lpcap
 
 %_sh.o: %.c
        $(CC) $(SH_CFLAGS) -o $@ -c $<
        
 clean:
-       rm -f $(SHARED_LIBS) *.o
+       $(RM) $(SHARED_LIBS) *.o
 
 distclean:
-       rm -f Makefile
+       $(RM) Makefile
 
 install: all
-       @INSTALL@ -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
-       @INSTALL@ -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
+       $(INSTALL) -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)

diff --git a/pgsql/Makefile.in b/pgsql/Makefile.in
index 5551cf489a767aa5801cb539267facb1cf02e4c3..a242e0da71089fca1ccc636853d272c22cca4568 100644 (file)
--- a/pgsql/Makefile.in
+++ b/pgsql/Makefile.in
@@ -14,17 +14,17 @@ all: $(SHARED_LIBS)
 distrib:
 
 $(SHARED_LIBS): %.so: %_sh.o
-       ld -shared $(PGSQL_LDFLAGS) -o $@ $< -lc
+       $(LD) -shared $(PGSQL_LDFLAGS) -o $@ $< -lc
 
 %_sh.o: %.c
        $(CC) $(PGSQL_CFLAGS) $(SH_CFLAGS) -o $@ -c $<
        
 clean:
-       rm -f $(SHARED_LIBS) *.o
+       $(RM) $(SHARED_LIBS) *.o
 
 distclean:
-       rm -f Makefile
+       $(RM) Makefile
 
 install: all
-       @INSTALL@ -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
-       @INSTALL@ -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(ULOGD_LIB_PATH)
+       $(INSTALL) -m 755 *.so $(DESTDIR)$(ULOGD_LIB_PATH)