Angus merged - thanks!
Regards -steve On Fri, 2007-09-28 at 22:44 +1200, Angus Salkeld wrote: > Hi > > This just makes sure that "make clean" does as advertised. > > The patch is inline and attached. > > -Angus > > > exec/Makefile | 3 ++- > lib/Makefile | 2 +- > test/Makefile | 19 ++++++++----------- > 3 files changed, 11 insertions(+), 13 deletions(-) > > diff --git a/exec/Makefile b/exec/Makefile > index b3ba711..025ef54 100644 > --- a/exec/Makefile > +++ b/exec/Makefile > @@ -200,7 +200,8 @@ openais-instantiate: openais-instantiate.o > $(CC) $(LDFLAGS) openais-instantiate.o -o openais-instantiate > > clean: > - rm -f aisexec $(OBJS) *.o *.lcrso libtotem_pg.so* libtotem_pg.a > gmon.out keygen keygen.o openais-instantiate *.da *.bb *.bbg > + rm -f aisexec $(OBJS) *.o *.lcrso libtotem_pg.so* libtotem_pg.a gmon.out > + rm -f keygen keygen.o openais-instantiate *.da *.bb *.bbg > liblogsys.so* liblogsys.a > > depend: > makedepend -Y -- $(CFLAGS) $(CPPFLAGS) $(EXEC_SRC) $(TOTEM_SRC) > $(LOGSYS_SRC) $(LCR_SRC) > /dev/null 2>&1 > diff --git a/lib/Makefile b/lib/Makefile > index 34ec30a..6cb0403 100644 > --- a/lib/Makefile > +++ b/lib/Makefile > @@ -159,7 +159,7 @@ libcfg.a: util.o cfg.o > clean: > rm -f *.o libais.so* libais.a libSaClm.so* libSaClm.a* libSaAmf.so* > libSaAmf.a \ > libSaCkpt.so* libSaCkpt.a* libSaEvt.so* libSaEvt.a libSaLck.so* > libSaLck.a \ > - libSaMsg.so* libSaMsg.a libcfg.so* libOpenaisCfg.a \ > + libSaMsg.so* libSaMsg.a libcfg.so* libOpenaisCfg.a > libaisutil.so* > libaisutil.a \ > libevs.so* libevs.a libcpg.so* libcpg.a libcfg.a *.da *.bb *.bbg > > # -fPIC rules required for all libraries > diff --git a/test/Makefile b/test/Makefile > index 38cfa54..0c6b1c6 100644 > --- a/test/Makefile > +++ b/test/Makefile > @@ -40,6 +40,12 @@ endif > > LIBRARIES= ../lib/libSaClm.a ../lib/libSaAmf.a ../lib/libSaCkpt.a > ../lib/libSaEvt.a ../lib/libSaLck.a ../lib/libSaMsg.a ../lib/libevs.a > ../lib/libcpg.a ../lib/libcfg.a > LIBS = $(LIBRARIES) > +BINARIES=testclm testamf1 \ > + testckpt ckptstress ckptbench \ > + ckptbenchth ckpt-rd ckpt-wr testevt testevs \ > + evsbench subscription publish evtbench unlink testclm2 testlck \ > + testmsg testcpg testcpg2 cpgbench openais-cfgtool \ > + logsys_s logsys_t1 logsys_t2 > > override CFLAGS += -I../include > override LDFLAGS += -L../lib > @@ -53,12 +59,7 @@ TEST_SRC = testclm.c testamf1.c \ > sa_error.c unlink.c testclm2.c testlck.c testmsg.c \ > logsys_s1.c logsys_s2.c logsys_s.c logsys_t1.c logsys_t2.c > > -all: testclm testamf1 \ > - testckpt ckptstress ckptbench \ > - ckptbenchth ckpt-rd ckpt-wr testevt testevs \ > - evsbench subscription publish evtbench unlink testclm2 testlck \ > - testmsg testcpg testcpg2 cpgbench openais-cfgtool \ > - logsys_s logsys_t1 logsys_t2 > +all: $(BINARIES) > > testtimer: testtimer.o $(LIBRARIES) > $(CC) $(LDFLAGS) -o testtimer testtimer.o ../exec/timer.o > @@ -166,11 +167,7 @@ logsys_t2: logsys_t2.o ../exec/liblogsys.a > $(CC) $(LDFLAGS) -o logsys_t2 logsys_t2.o ../exec/liblogsys.a > > clean: > - rm -f *.o testclm testamf testamf1 testamf2 testamf3 testamf4 \ > - testamf5 testamf6 testamfth testckpt ckptstress testtimer \ > - ckptbench ckptbenchth testevt testevs ckpt-wr ckpt-rd \ > - evsbench subscription publish evtbench unlink testmsg testcpg \ > - testclm2 testlck > + rm -f *.o $(LIBRARIES) $(BINARIES) > > %.o: %.c > $(CC) $(CFLAGS) $(CPPFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< > _______________________________________________ > Openais mailing list > [email protected] > https://lists.linux-foundation.org/mailman/listinfo/openais _______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
