From 06b1fbf01f36dbe5af9cf33cb130c83deb28a49a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 12 Mar 2008 20:16:48 -0700 Subject: [PATCH] makefile cleanup --- src/.gitignore | 5 +++ src/Makefile.am | 46 ++++++++++++-------- src/Makefile.swig | 105 ---------------------------------------------- src/dupstore.cc | 2 +- 4 files changed, 34 insertions(+), 124 deletions(-) delete mode 100644 src/Makefile.swig diff --git a/src/.gitignore b/src/.gitignore index c4db1f3091ae1..4ac15944436fe 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -21,3 +21,8 @@ tags out acconfig.h.in acconfig.h + +*.so +crush/*.fpicco +CrushWrapper.pm +crush/CrushWrapper_wrap.cxx diff --git a/src/Makefile.am b/src/Makefile.am index 8b0586ea5ec1a..4c5d3e4531191 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,11 @@ cmds_LDADD = libmds.a libosdc.a libcrush.a libcommon.a # osd cosd_SOURCES = cosd.cc msg/SimpleMessenger.cc -cosd_LDADD = libosd.a libebofs.a libcrush.a libcommon.a +cosd_LDADD = libosd.a libos.a libebofs.a libcrush.a libcommon.a +dupstore_SOURCES = dupstore.cc config.cc +dupstore_LDADD = libos.a libebofs.a libcommon.a +streamtest_SOURCES = streamtest.cc +streamtest_LDADD = libos.a libebofs.a libcommon.a # synthetic client csyn_SOURCES = csyn.cc msg/SimpleMessenger.cc @@ -42,22 +46,18 @@ endif cfuse_SOURCES = cfuse.cc msg/SimpleMessenger.cc client/fuse.cc client/fuse_ll.cc cfuse_LDADD = -lfuse libclient.a libosdc.a libcrush.a libcommon.a fakefuse_SOURCES = fakefuse.cc msg/FakeMessenger.cc client/fuse.cc client/fuse_ll.cc -fakefuse_LDADD = -lfuse libmon.a libmds.a libosd.a libebofs.a \ +fakefuse_LDADD = -lfuse libmon.a libmds.a libosd.a libos.a libebofs.a \ libclient.a libosdc.a libcrush.a libcommon.a # debug targets fakesyn_SOURCES = fakesyn.cc msg/FakeMessenger.cc -fakesyn_LDADD = libmon.a libmds.a libosd.a libebofs.a \ +fakesyn_LDADD = libmon.a libmds.a libosd.a libos.a libebofs.a \ libclient.a libosdc.a libcrush.a libcommon.a #newsyn_SOURCES = newsyn.cc msg/SimpleMessenger.cc #newsyn_LDADD = libmon.a libmds.a libosd.a libebofs.a \ # libclient.a libosdc.a libcrush.a libcommon.a -# tester tools -streamtest_SOURCES = streamtest.cc -streamtest_LDADD = libosd.a libebofs.a libcommon.a - # crushwrapper SWIG_FILES = crush/CrushWrapper.i crush/CrushWrapper.h crush/CrushWrapper_wrap.cxx: ${SWIG_FILES} @@ -91,15 +91,23 @@ bin_PROGRAMS = \ cmonctl \ mkmonfs monmaptool osdmaptool \ fakesyn \ - streamtest \ + streamtest dupstore \ $(FUSEBIN) $(NEWSYN) noinst_LIBRARIES = \ libcommon.a libcrush.a \ - libmon.a libmds.a libosdc.a libosd.a libebofs.a libclient.a + libmon.a libmds.a libosdc.a libosd.a libclient.a \ + libos.a libebofs.a # extra bits EXTRA_DIST = start.sh stop.sh crushtool +# cleaning +clean-local: + -rm crush/*.fpicco + -rm crush/*.cxx + -rm libCrushWrapper.so + -rm CrushWrapper.pm + # libs libcommon_a_SOURCES = \ msg/Message.cc \ @@ -128,13 +136,6 @@ libmon_a_SOURCES = \ mon/Elector.cc \ mon/MonitorStore.cc -libebofs_a_SOURCES = \ - ebofs/BlockDevice.cc \ - ebofs/BufferCache.cc \ - ebofs/Ebofs.cc \ - ebofs/Allocator.cc \ - osd/FileJournal.cc - libmds_a_SOURCES = \ mds/MDS.cc \ mds/journal.cc \ @@ -153,13 +154,21 @@ libmds_a_SOURCES = \ mds/SessionMap.cc \ mds/MDLog.cc +libebofs_a_SOURCES = \ + ebofs/BlockDevice.cc \ + ebofs/BufferCache.cc \ + ebofs/Ebofs.cc \ + ebofs/Allocator.cc +libos_a_SOURCES = \ + osd/FileJournal.cc \ + osd/FakeStore.cc \ + osd/JournalingObjectStore.cc + libosd_a_SOURCES = \ osd/PG.cc \ osd/ReplicatedPG.cc \ osd/RAID4PG.cc \ osd/Ager.cc \ - osd/FakeStore.cc \ - osd/JournalingObjectStore.cc \ osd/OSD.cc libosdc_a_SOURCES = \ @@ -201,6 +210,7 @@ noinst_HEADERS = \ crush/mapper.h\ crush/types.h\ crush/CrushWrapper.h\ + crush/CrushWrapper.i\ crush/crush.h\ ebofs/Table.h\ ebofs/csum.h\ diff --git a/src/Makefile.swig b/src/Makefile.swig deleted file mode 100644 index efa29155e560e..0000000000000 --- a/src/Makefile.swig +++ /dev/null @@ -1,105 +0,0 @@ - -EXTRA_CFLAGS += -g -EXTRA_CFLAGS += -pg -#EXTRA_CFLAGS += -O3 - -# base -CFLAGS = -fPIC -Wall -I. -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE ${EXTRA_CFLAGS} -LDINC = ld -i -o -CXX = g++ -CC = gcc -LIBS = -pthread - -MON_OBJS= \ - mon/Monitor.o\ - mon/Paxos.o\ - mon/PaxosService.o\ - mon/OSDMonitor.o\ - mon/MDSMonitor.o\ - mon/ClientMonitor.o\ - mon/PGMonitor.o\ - mon/Elector.o\ - mon/MonitorStore.o - -COMMON_OBJS= \ - msg/Message.o\ - common/Logger.o\ - common/Clock.o\ - common/Timer.o\ - mon/MonMap.o\ - config.o - -# -perl: common.o crush.o - swig -perl5 -c++ -shadow crush/CrushWrapper.i - ${CXX} ${CFLAGS} -c -fPIC crush/CrushWrapper_wrap.cxx -I/usr/lib/perl/5.8/CORE -fno-strict-aliasing -pipe -o crush/CrushWrapper_wrap.o - ${CXX} -shared -fPIC crush/CrushWrapper_wrap.o common.o crush.o -o crush/CrushWrapper.so - - - -#/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/lib/perl/5.8/CORE -I. -I/home/michael/ceph/src/ - -# targets -TARGETS = cmon cosd cmds csyn mkmonmap cmonctl fakesyn dupstore -SRCS=*.cc */*.cc *.h */*.h */*/*.h - -ifneq ($(fuse),no) -TARGETS += cfuse fakefuse -endif - -ifneq ($(mpi),no) -TARGETS += newsyn -endif - -all: depend ${TARGETS} - -# crush -# lameness: use .co extension for .c files -%.co: %.c - ${CC} ${CFLAGS} -c $< -o $@ - -crush.o: crush/builder.co crush/mapper.co crush/crush.co - ${LDINC} $@ $^ - -# bits -common.o: ${COMMON_OBJS} - ${LDINC} $@ $^ - - -# generic rules -%.so: %.cc - ${CXX} -shared -fPIC ${CFLAGS} $< -o $@ - -%.o: %.cc - ${CXX} -fPIC ${CFLAGS} -c $< -o $@ - -%.po: %.cc - ${CXX} -fPIC ${CFLAGS} -c $< -o $@ - - -# handy -clean: - rm -f *.o */*.o crush/*.co ${TARGETS} - -count: - cat ${SRCS} | wc -l - cat ${SRCS} | grep -c \; - -TAGS: - etags `find . -name "*.[h|c|cc]"|grep -v '\.\#'` - -tags: - ctags `find . -name "*.[h|c|cc]"|grep -v '\.\#'` - -.depend: - touch .depend - -depend: - $(RM) .depend - makedepend -f- -- $(CFLAGS) -- $(SRCS) > .depend 2>/dev/null -# for f in $(SRCS) ; do cpp -MM $(CFLAGS) $$f 2> /dev/null >> .depend ; done - - -# now add a line to include the dependency list. -include .depend -# DO NOT DELETE diff --git a/src/dupstore.cc b/src/dupstore.cc index e670b660156ac..f07f009f9955c 100644 --- a/src/dupstore.cc +++ b/src/dupstore.cc @@ -84,7 +84,7 @@ int main(int argc, const char **argv) if (args.size() != 4) usage(); - ObjectStore *src, *dst; + ObjectStore *src = 0, *dst = 0; if (strcmp(args[0], "ebofs") == 0) src = new Ebofs(args[1]); -- 2.39.5