From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Mon, 30 Mar 2009 19:23:30 +0000 (-0400)
Subject: start working on autotools build system
X-Git-Tag: v1.9.1~1026
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;ds=sidebyside;h=1304f3dfeb42271cebb865409bd3e010e2512aa4;hp=e4621c7f086a79cd5a454f3d7ff42b5adf244c1a;p=lttng-ust.git

start working on autotools build system
---

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 7d541738..00000000
--- a/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-CFLAGS="-I ../../../../urcu -I ../../../../libkcompat -Wl,-rpath ../../../../urcu"
-
-all:
-	CFLAGS=${CFLAGS} make -C libmarkers
-	CFLAGS=${CFLAGS} make -C libtracing
-	CFLAGS=${CFLAGS} make -C libtracectl
-	CFLAGS=${CFLAGS} make -C hello
-	CFLAGS=${CFLAGS} make -C libmallocwrap
-
-.PHONY: all
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 00000000..2cab9628
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libmarkers
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 00000000..ad7f6645
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+aclocal \
+&& automake --gnu --add-missing \
+&& autoconf
diff --git a/configure.in b/configure.in
new file mode 100644
index 00000000..6da50cc2
--- /dev/null
+++ b/configure.in
@@ -0,0 +1,67 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+#AC_PREREQ([2.63])
+AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca])
+AC_CONFIG_AUX_DIR(make_scripts)
+AM_INIT_AUTOMAKE([0.0 foreign])
+AC_CONFIG_SRCDIR([ust/localerr.h])
+#AC_CONFIG_HEADERS([config.h])
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_MAKE_SET
+AC_PROG_LIBTOOL
+
+## Checks for libraries.
+## FIXME: Replace `main' with a function in `-ldl':
+#AC_CHECK_LIB([dl], [main])
+## FIXME: Replace `main' with a function in `-lmarkers':
+#AC_CHECK_LIB([markers], [main])
+## FIXME: Replace `main' with a function in `-lpthread':
+#AC_CHECK_LIB([pthread], [main])
+## FIXME: Replace `main' with a function in `-ltracectl':
+#AC_CHECK_LIB([tracectl], [main])
+## FIXME: Replace `main' with a function in `-ltracing':
+#AC_CHECK_LIB([tracing], [main])
+## FIXME: Replace `main' with a function in `-lurcu':
+#AC_CHECK_LIB([urcu], [main])
+
+# Checks for header files.
+#AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_INLINE
+#AC_TYPE_INT16_T
+#AC_TYPE_INT32_T
+#AC_TYPE_INT64_T
+#AC_TYPE_INT8_T
+#AC_TYPE_PID_T
+#AC_TYPE_SIZE_T
+#AC_TYPE_SSIZE_T
+#AC_TYPE_UINT16_T
+#AC_TYPE_UINT32_T
+#AC_TYPE_UINT64_T
+#AC_TYPE_UINT8_T
+#AC_CHECK_TYPES([ptrdiff_t])
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
+
+AC_ARG_WITH(urcu, [  --with-urcu path	Path to userspace RCU source], URCU_PATH="$withval", AC_MSG_ERROR([Must specify urcu path.]))
+AC_ARG_WITH(kcompat, [  --with-kcompat path	Path to userspace kcompat source], KCOMPAT_PATH="$withval", AC_MSG_ERROR([Must specify kcompat path.]))
+AC_SUBST(URCU_PATH)
+AC_SUBST(KCOMPAT_PATH)
+
+#AC_CONFIG_FILES([Makefile
+#                 hello/Makefile
+#                 libmallocwrap/Makefile
+#                 libmarkers/Makefile
+#                 libtracectl/Makefile
+#                 libtracing/Makefile
+#                 ust/Makefile
+#                 ustd/Makefile])
+
+AC_CONFIG_FILES([Makefile libmarkers/Makefile])
+AC_OUTPUT
diff --git a/libmarkers/Makefile b/libmarkers/Makefile
deleted file mode 100644
index 746ea318..00000000
--- a/libmarkers/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-all: libmarkers.so
-
-libmarkers.so: marker.c *.c *.h
-	gcc -g -fPIC -I../share -I../libtracing -I. -shared -o libmarkers.so -L../../../../urcu -I../../../../urcu $(CFLAGS) -lurcu marker.c tracepoint.c ../share/kref.c ../libtracing/channels.c
-
-.PHONY: libmarkers.so all
diff --git a/make_scripts/dummy b/make_scripts/dummy
new file mode 100644
index 00000000..96f5cffa
--- /dev/null
+++ b/make_scripts/dummy
@@ -0,0 +1 @@
+Dummy file so git adds this directory.