rename common lib to libmfu

hpc · Jan 24, 2017 · 63a4b61 · 63a4b61
1 parent 3678c80
commit 63a4b61
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 17 deletions.
diff --git a/buildme b/buildme
@@ -26,6 +26,7 @@ export CC=mpicc
 export CFLAGS="-I${topdir}/src/common -DDCOPY_USE_XATTRS"
 export LDFLAGS="-Wl,-rpath,${topdir}/install/lib -L${topdir}/install/lib -lcircle"
 
+#  --enable-experimental \
 ../configure \
   --enable-lustre \
   --prefix=$installdir \

diff --git a/experimental/dfind/Makefile.am b/experimental/dfind/Makefile.am
@@ -16,4 +16,4 @@ dfind_SOURCES = \
 
 dfind_CPPFLAGS = -I../../src/common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dfind_LDFLAGS = $(MPI_CLDFLAGS)
-dfind_LDADD = ../../src/common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dfind_LDADD = ../../src/common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/experimental/dgrep/Makefile.am b/experimental/dgrep/Makefile.am
@@ -9,4 +9,4 @@ noinst_HEADERS = \
 dgrep_SOURCES = dgrep.c
 dgrep_CPPFLAGS = -I../../src/common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dgrep_LDFLAGS = $(MPI_CLDFLAGS)
-dgrep_LDADD = ../../src/common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dgrep_LDADD = ../../src/common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/experimental/dparallel/Makefile.am b/experimental/dparallel/Makefile.am
@@ -9,4 +9,4 @@ noinst_HEADERS = \
 dparallel_SOURCES = dparallel.c
 dparallel_CPPFLAGS = -I../../src/common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dparallel_LDFLAGS = $(MPI_CLDFLAGS)
-dparallel_LDADD = ../../src/common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dparallel_LDADD = ../../src/common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/experimental/dsh/Makefile.am b/experimental/dsh/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = dsh
 dsh_SOURCES = dsh.c
 dsh_CPPFLAGS = -I../common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dsh_LDFLAGS = $(MPI_CLDFLAGS)
-dsh_LDADD = ../common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dsh_LDADD = ../common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/experimental/dtar/Makefile.am b/experimental/dtar/Makefile.am
@@ -9,5 +9,5 @@ dtar_SOURCES = dtar.c common.c handle_args.c
 dtar_CPPFLAGS = -I../../src/common/ \
 				$(MPI_CFLAGS) $(libcircle_CFLAGS) $(libarchive_CFLAGS)
 dtar_LDFLAGS = $(MPI_CLDFLAGS)
-dtar_LDADD = ../../src/common/libfileutils_common.a \
+dtar_LDADD = ../../src/common/libmfu.la \
 			 $(MPI_CLDFLAGS) $(libcircle_LIBS) $(libarchive_LIBS)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -1,8 +1,10 @@
 include $(top_srcdir)/common.mk
 
-noinst_LIBRARIES = libfileutils_common.a
+#noinst_LIBRARIES = libfileutils_common.a
+lib_LTLIBRARIES = libmfu.la
 
-noinst_HEADERS = \
+#noinst_HEADERS = \
+include_HEADERS = \
     mfu.h \
     mfu_flist.h \
     mfu_flist_internal.h \
@@ -13,7 +15,7 @@ noinst_HEADERS = \
     strmap.h \
     list.h
 
-libfileutils_common_a_SOURCES = \
+libmfu_la_SOURCES = \
     mfu_flist.c \
     mfu_flist_chunk.c \
     mfu_flist_io.c \
@@ -27,6 +29,6 @@ libfileutils_common_a_SOURCES = \
     mfu_util.c \
     strmap.c
 
-libfileutils_common_a_CPPFLAGS = \
+libmfu_la_CPPFLAGS = \
      $(MPI_CFLAGS) \
      $(libcircle_CFLAGS)
diff --git a/src/dchmod/Makefile.am b/src/dchmod/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = dchmod
 dchmod_SOURCES = dchmod.c
 dchmod_CPPFLAGS = -I../common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dchmod_LDFLAGS = $(MPI_CLDFLAGS)
-dchmod_LDADD = ../common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dchmod_LDADD = ../common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/src/dcmp/Makefile.am b/src/dcmp/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = dcmp
 dcmp_SOURCES = dcmp.c
 dcmp_CPPFLAGS = -I../common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dcmp_LDFLAGS = $(MPI_CLDFLAGS)
-dcmp_LDADD = ../common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dcmp_LDADD = ../common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/src/dcp/Makefile.am b/src/dcp/Makefile.am
@@ -14,4 +14,4 @@ dcp_SOURCES = \
 
 dcp_CPPFLAGS = -I../common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dcp_LDFLAGS = $(MPI_CLDFLAGS)
-dcp_LDADD = ../common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dcp_LDADD = ../common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/src/dcp1/Makefile.am b/src/dcp1/Makefile.am
@@ -22,4 +22,4 @@ dcp1_SOURCES = \
 
 dcp1_CPPFLAGS = -I../common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dcp1_LDFLAGS = $(MPI_CLDFLAGS)
-dcp1_LDADD = ../common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dcp1_LDADD = ../common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/src/ddup/Makefile.am b/src/ddup/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = ddup
 ddup_SOURCES = ddup.c
 ddup_CPPFLAGS = -I../common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 ddup_LDFLAGS = $(MPI_CLDFLAGS)
-ddup_LDADD = ../common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS) $(libcrypto_LIBS)
+ddup_LDADD = ../common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS) $(libcrypto_LIBS)
diff --git a/src/dfilemaker/Makefile.am b/src/dfilemaker/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = dfilemaker
 dfilemaker_SOURCES = dfilemaker.c
 dfilemaker_CPPFLAGS = -I../common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dfilemaker_LDFLAGS = $(MPI_CLDFLAGS)
-dfilemaker_LDADD = ../common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dfilemaker_LDADD = ../common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/src/drm/Makefile.am b/src/drm/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = drm
 drm_SOURCES = drm.c
 drm_CPPFLAGS = -I../common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 drm_LDFLAGS = $(MPI_CLDFLAGS)
-drm_LDADD = ../common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+drm_LDADD = ../common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)
diff --git a/src/dwalk/Makefile.am b/src/dwalk/Makefile.am
@@ -5,4 +5,4 @@ bin_PROGRAMS = dwalk
 dwalk_SOURCES = dwalk.c
 dwalk_CPPFLAGS = -I../common/ $(MPI_CFLAGS) $(libcircle_CFLAGS)
 dwalk_LDFLAGS = $(MPI_CLDFLAGS)
-dwalk_LDADD = ../common/libfileutils_common.a $(MPI_CLDFLAGS) $(libcircle_LIBS)
+dwalk_LDADD = ../common/libmfu.la $(MPI_CLDFLAGS) $(libcircle_LIBS)