• R/O
  • SSH
  • HTTPS

caraway: Commit


Commit MetaInfo

Revision726 (tree)
Time2007-07-02 01:41:31
Authorreno

Log Message

implemented for static library

Change Summary

Incremental Difference

--- cwbase/trunk/Makefile.in (revision 725)
+++ cwbase/trunk/Makefile.in (revision 726)
@@ -22,6 +22,8 @@
2222 ACLOCAL_DIR = $(datadir)/cwbase/$(VERSION)/
2323 DESTDIR =
2424
25+LIBRARY = @LIBRARY@
26+
2527 CONFIG_GENERATED = Makefile config.cache config.log config.status libtool \
2628 configure.lineno autom4* gc/autom4*
2729 AUTOCONF_GENERATED = $(CONFIG_GENERATED) configure
@@ -32,15 +34,18 @@
3234 ANSI_CFLAGS = -ansi -pedantic-errors
3335 CFLAGS = -O2 $(ANSI_CFLAGS) $(WARN_CFLAGS) -I. -g
3436
35-BASE_OBJS = object.o autorelease_pool.o byte_order.o string.o array.o link.o list.o iter.o zone.o exception.o log.o stream.o data.o value.o file.o
37+LIBRARY_OBJS = object.o autorelease_pool.o byte_order.o string.o array.o link.o list.o iter.o zone.o exception.o log.o stream.o data.o value.o file.o
3638
3739 .c.o:
3840 $(CC) -c $(CFLAGS) -o $@ $<
3941
40-all: baselib
42+all: $(LIBRARY)
4143
42-baselib: $(BASE_OBJS)
44+$(LIBRARY): $(LIBRARY_OBJS)
45+ $(AR) cr $@ $(LIBRARY_OBJS)
46+ $(RANLIB) $@
4347
4448 clean:
4549 rm -rf $(CONFIG_GENERATED)
46- rm -rf $(BASE_OBJS)
50+ rm -rf $(LIBRARY_OBJS)
51+ rm -rf $(LIBRARY)
--- cwbase/trunk/configure.in (revision 725)
+++ cwbase/trunk/configure.in (revision 726)
@@ -62,6 +62,7 @@
6262 LIBRARY='libcwbase.a'
6363
6464 AC_PROG_RANLIB
65+AC_SUBST(LIBRARY)
6566 AC_SUBST(AR)
6667 AC_CHECK_PROGS(AR, ar aal, ar)
6768
Show on old repository browser