From e8300fb7111bd3686d8b863db0c661ae491ee6ae Mon Sep 17 00:00:00 2001
From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Wed, 17 Mar 2010 12:23:17 -0400
Subject: [PATCH] rename libinterfork -> libustfork

---
 Makefile.am                                      | 2 +-
 configure.ac                                     | 2 +-
 libinterfork/Makefile.am                         | 6 ------
 libustfork/Makefile.am                           | 6 ++++++
 libinterfork/interfork.c => libustfork/ustfork.c | 0
 usttrace                                         | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 libinterfork/Makefile.am
 create mode 100644 libustfork/Makefile.am
 rename libinterfork/interfork.c => libustfork/ustfork.c (100%)

diff --git a/Makefile.am b/Makefile.am
index e3a4bbdc..e2d131a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4
 # libust and '.' (that contains the linker script). However, '.'
 # must be installed after libust so it can overwrite libust.so with
 # the linker script.
-SUBDIRS = snprintf libustcomm libust . tests libmallocwrap ustd ustctl libinterfork include
+SUBDIRS = snprintf libustcomm libust . tests libmallocwrap ustd ustctl libustfork include
 
 EXTRA_DIST = doc libust.ldscript.in libust-initializer.c
 dist_bin_SCRIPTS = usttrace
diff --git a/configure.ac b/configure.ac
index e8cedce6..908f5478 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,7 @@ AC_CONFIG_FILES([
 	tests/test-nevents/Makefile
 	tests/test-libmallocwrap/Makefile
 	libmallocwrap/Makefile
-	libinterfork/Makefile
+	libustfork/Makefile
 	ustd/Makefile
 	ustctl/Makefile
 	libustcomm/Makefile
diff --git a/libinterfork/Makefile.am b/libinterfork/Makefile.am
deleted file mode 100644
index 7a302bd4..00000000
--- a/libinterfork/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-lib_LTLIBRARIES = libinterfork.la
-libinterfork_la_SOURCES = interfork.c
-libinterfork_la_LIBADD = -ldl
-libinterfork_CFLAGS = -DUST_COMPONENT=libinterfork
diff --git a/libustfork/Makefile.am b/libustfork/Makefile.am
new file mode 100644
index 00000000..837f8dc3
--- /dev/null
+++ b/libustfork/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+lib_LTLIBRARIES = libustfork.la
+libustfork_la_SOURCES = ustfork.c
+libustfork_la_LIBADD = -ldl
+libustfork_CFLAGS = -DUST_COMPONENT=libustfork
diff --git a/libinterfork/interfork.c b/libustfork/ustfork.c
similarity index 100%
rename from libinterfork/interfork.c
rename to libustfork/ustfork.c
diff --git a/usttrace b/usttrace
index b28a8d01..0d2a68ae 100755
--- a/usttrace
+++ b/usttrace
@@ -27,7 +27,7 @@ USTTRACE_DIR="$(dirname $0)"
 if [ -x "${USTTRACE_DIR}/ustd/ustd" ] ; then
     # Use the not installed libraries instead
     USTD="${USTTRACE_DIR}/ustd/ustd"
-    LIBINTERFORK_PATH="${USTTRACE_DIR}/libinterfork/.libs/libinterfork.so"
+    LIBINTERFORK_PATH="${USTTRACE_DIR}/libustfork/.libs/libustfork.so"
     LIBMALLOCWRAP_PATH="${USTTRACE_DIR}/libmallocwrap/.libs/libmallocwrap.so"
     LIBUST_PATH="${USTTRACE_DIR}/libust/.libs/libust.so"
 else
@@ -37,7 +37,7 @@ else
         error "cannot find an executable ustd; make sure its location is in the PATH"
         exit 1
     fi
-    LIBINTERFORK_PATH="libinterfork.so"
+    LIBINTERFORK_PATH="libustfork.so"
     LIBMALLOCWRAP_PATH="libmallocwrap.so"
     LIBUST_PATH="libust.so.0"
 fi
-- 
2.34.1