make autotools optional and start a sane config.h by default
diff --git a/Makefile b/Makefile
index b7c1807..6f0e4c1 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@
@./IDcheck.sh
-libltp.a:
+libltp.a: config.h
@$(MAKE) -C lib $@
uclinux: uclinux_libltp.a
@@ -89,16 +89,16 @@
menuconfig:
@./ltpmenu
-clean: dist-clean ac-dist-clean
+clean: ac-clean
@$(MAKE) -C lib $@
@$(MAKE) -C pan $@
@$(MAKE) -C tools $@
@$(MAKE) -C testcases $@
-dist-clean: clean ac-dist-clean
+distclean: clean ac-distclean
@$(MAKE) -C include $@
-maintainer-clean: dist-clean ac-maintainer-clean
+maintainer-clean: distclean ac-maintainer-clean
@$(MAKE) -C include $@
package:
@@ -106,21 +106,21 @@
#
-# Autoconf related
+# Autotools related
#
-config.h: config.h.in configure
- ./configure
+configure: configure.ac $(notdir $(wildcard m4/*.m4)) config.h.in
+ autoconf
config.h.in: configure.ac
autoheader
-configure: configure.ac $(notdir $(wildcard m4/*.m4))
- autoconf
+config.h: config.h.default
+ cp include/config.h.default include/config.h
-.PHONY: ac-dist-clean ac-maintainer-clean
-ac-dist-clean:
+.PHONY: ac-clean ac-distclean ac-ac-maintainer-clean
+ac-clean:
rm -rf autom4te.cache
- rm -f config.log config.status
-
-ac-maintainer-clean:
+ rm -f config.log config.status
+ac-distclean: ac-clean
+ac-maintainer-clean: ac-distclean
rm -f configure
diff --git a/include/Makefile b/include/Makefile
index dd9d14f..461eb93 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -6,6 +6,7 @@
str_to_bytes.h test.h tlibio.h usctest.h write_log.h \
linux_syscall_numbers.h libtestsuite.h config.h
+.PHONY: all install
all:
install: $(HEADERS)
@@ -13,11 +14,14 @@
install -D -m 644 $$i $(DESTDIR)/$(PREFIX)/include/ltp/$$i; \
done
-dist-clean: ac-dist-clean
-maintainer-clean: dist-clean ac-maintainer-clean
+.PHONY: clean distclean maintainer-clean
+clean: ac-clean
+distclean: clean ac-distclean
+maintainer-clean: distclean ac-maintainer-clean
-.PHONY: ac-dist-clean ac-maintainer-clean
-ac-dist-clean:
+.PHONY: ac-clean ac-distclean ac-maintainerclean
+ac-clean:
+ac-distclean:
rm -f config.h
ac-maintainer-clean:
rm -f config.h.in
diff --git a/include/config.h.default b/include/config.h.default
new file mode 100644
index 0000000..6c235fc
--- /dev/null
+++ b/include/config.h.default
@@ -0,0 +1,13 @@
+/* include/config.h.default: default settings for the latest sane systems.
+ * Only add settings here which reflect the latest & greatest. That means
+ * Linux / POSIX systems that have been released for over a year are fair
+ * game. Please note when certain features were first available.
+ */
+
+/* Linux kernel headers have been santized for userspace since 2.6.18 */
+#define HAVE_LINUX_TYPES_H 1
+
+/* signalfd() is in glibc-2.7+ */
+#define HAVE_SYS_SIGNALFD_H 1
+#define HAVE_SIGNALFD 1
+#define HAVE_SIGNALFD_SIGINFO_SSI_SIGNO 1