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

7 files changed, 27 insertions, 23 deletions

diff --git a/Rules.make.in b/Rules.make.in
index 4b3fcff..36c0d56 100644
--- 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 5d0d99b..1b94de7 100644
--- 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 260e75b..4c41930 100644
--- 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 f5e416e..52a3394 100644
--- 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 ed6003f..cbab843 100644
--- 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 76d4caa..d469c2b 100644
--- 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 5551cf4..a242e0d 100644
--- 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)