[hipl-commit] [trunk] Rev 4202: Use libtool to build i3-related libraries, like we do for all other components.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Fri, 9 Apr 2010 13:00:24 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 09/04/2010 at 13:00:24
Revision: 4202
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Use libtool to build i3-related libraries, like we do for all other 
components.

Modified:
  M  Makefile.am

=== modified file 'Makefile.am'
--- Makefile.am 2010-04-09 09:19:59 +0000
+++ Makefile.am 2010-04-09 09:59:18 +0000
@@ -91,11 +91,8 @@
 endif
 
 if HIP_I3
-noinst_LIBRARIES = i3/aeshash/libaes.a        \
-                   i3/chord/libchord.a        \
-                   i3/i3/libi3.a              \
-                   i3/i3_client/libi3client.a \
-                   i3/utils/libutils.a
+lib_LTLIBRARIES += i3/libi3.la \
+                   i3/chord/libchord.la
 endif
 
 
@@ -280,65 +277,61 @@
 lib_dht_libhipdht_la_SOURCES = lib/dht/libhipdht.c      \
                                lib/dht/libhipdhtxml.c
 
-i3_aeshash_libaes_a_SOURCES = i3/aeshash/aescrypp.c \
-                              i3/aeshash/aescrypt.c \
-                              i3/aeshash/aeshash.c  \
-                              i3/aeshash/aeskey.c   \
-                              i3/aeshash/aeskeypp.c \
-                              i3/aeshash/aestab.c
-
-i3_chord_libchord_a_SOURCES = i3/chord/api.c        \
-                              i3/chord/chord.c      \
-                              i3/chord/eprintf.c    \
-                              i3/chord/finger.c     \
-                              i3/chord/hosts.c      \
-                              i3/chord/join.c       \
-                              i3/chord/pack.c       \
-                              i3/chord/process.c    \
-                              i3/chord/sendpkt.c    \
-                              i3/chord/stabilize.c  \
-                              i3/chord/util.c       \
-                              i3/utils/gen_utils.c
-
-
-i3_i3_libi3_a_SOURCES = i3/i3/i3_addr.c     \
-                        i3/i3/i3_api.c      \
-                        i3/i3/i3_config.c   \
-                        i3/i3/i3_header.c   \
-                        i3/i3/i3_id.c       \
-                        i3/i3/i3_misc.c     \
-                        i3/i3/i3_options.c  \
-                        i3/i3/i3_ping.c     \
-                        i3/i3/i3_stack.c    \
-                        i3/i3/i3_tcp_fns.c  \
-                        i3/i3/i3_trigger.c  \
-                        i3/i3/i3_utils.c    \
-                        i3/i3/token_bucket.c
-
-i3_i3_client_libi3client_a_SOURCES = i3/i3_client/coordinates.c         \
-                                     i3/i3_client/downhill_simplex.c    \
-                                     i3/i3_client/http.c                \
-                                     i3/i3_client/i3_client_api.c       \
-                                     i3/i3_client/i3_client_api_ctx.c   \
-                                     i3/i3_client/i3_client_api_ext.c   \
-                                     i3/i3_client/i3_client_callback.c  \
-                                     i3/i3_client/i3_client_context.c   \
-                                     i3/i3_client/i3_client_fd.c        \
-                                     i3/i3_client/i3_client_id.c        \
-                                     i3/i3_client/i3_client_pkt.c       \
-                                     i3/i3_client/i3_client_timer.c     \
-                                     i3/i3_client/i3_client_trigger.c   \
-                                     i3/i3_client/i3server_list.c       \
-                                     i3/i3_client/ping.c                \
-                                     i3/i3_client/ping_thread.c         \
-                                     i3/i3_client/qsort.c
-
-i3_utils_libutils_a_SOURCES = i3/utils/byteorder.c      \
-                              i3/utils/eprintf.c        \
-                              i3/utils/event.c          \
-                              i3/utils/gen_utils.c      \
-                              i3/utils/inetfns.c        \
-                              i3/utils/netwrap_posix.c
+i3_libi3_la_SOURCES = i3/aeshash/aescrypp.c              \
+                      i3/aeshash/aescrypt.c              \
+                      i3/aeshash/aeshash.c               \
+                      i3/aeshash/aeskey.c                \
+                      i3/aeshash/aeskeypp.c              \
+                      i3/aeshash/aestab.c                \
+                      i3/i3/i3_addr.c                    \
+                      i3/i3/i3_api.c                     \
+                      i3/i3/i3_config.c                  \
+                      i3/i3/i3_header.c                  \
+                      i3/i3/i3_id.c                      \
+                      i3/i3/i3_misc.c                    \
+                      i3/i3/i3_options.c                 \
+                      i3/i3/i3_ping.c                    \
+                      i3/i3/i3_stack.c                   \
+                      i3/i3/i3_tcp_fns.c                 \
+                      i3/i3/i3_trigger.c                 \
+                      i3/i3/i3_utils.c                   \
+                      i3/i3/token_bucket.c               \
+                      i3/i3_client/coordinates.c         \
+                      i3/i3_client/downhill_simplex.c    \
+                      i3/i3_client/http.c                \
+                      i3/i3_client/i3_client_api.c       \
+                      i3/i3_client/i3_client_api_ctx.c   \
+                      i3/i3_client/i3_client_api_ext.c   \
+                      i3/i3_client/i3_client_callback.c  \
+                      i3/i3_client/i3_client_context.c   \
+                      i3/i3_client/i3_client_fd.c        \
+                      i3/i3_client/i3_client_id.c        \
+                      i3/i3_client/i3_client_pkt.c       \
+                      i3/i3_client/i3_client_timer.c     \
+                      i3/i3_client/i3_client_trigger.c   \
+                      i3/i3_client/i3server_list.c       \
+                      i3/i3_client/ping.c                \
+                      i3/i3_client/ping_thread.c         \
+                      i3/i3_client/qsort.c               \
+                      i3/utils/byteorder.c               \
+                      i3/utils/eprintf.c                 \
+                      i3/utils/event.c                   \
+                      i3/utils/gen_utils.c               \
+                      i3/utils/inetfns.c                 \
+                      i3/utils/netwrap_posix.c
+
+i3_chord_libchord_la_SOURCES = i3/chord/api.c        \
+                               i3/chord/chord.c      \
+                               i3/chord/eprintf.c    \
+                               i3/chord/finger.c     \
+                               i3/chord/hosts.c      \
+                               i3/chord/join.c       \
+                               i3/chord/pack.c       \
+                               i3/chord/process.c    \
+                               i3/chord/sendpkt.c    \
+                               i3/chord/stabilize.c  \
+                               i3/chord/util.c       \
+                               i3/utils/gen_utils.c
 
 i3_chord_chord_getfingers_SOURCES = i3/chord/chord_getfingers.c
 i3_chord_chord_traceroute_SOURCES = i3/chord/chord_traceroute.c
@@ -404,10 +397,7 @@
                   lib/core/libhipcore.la
 
 if HIP_I3
-hipd_hipd_LDADD += i3/i3_client/libi3client.a \
-                   i3/i3/libi3.a              \
-                   i3/utils/libutils.a        \
-                   i3/aeshash/libaes.a
+hipd_hipd_LDADD += i3/libi3.la
 endif
 
 if HIP_DHT
@@ -432,11 +422,11 @@
 
 agent_hipagent_LDFLAGS = `pkg-config --libs gtk+-2.0 gthread-2.0`
 
-i3_chord_chord_getfingers_LDADD = i3/chord/libchord.a
-i3_chord_chord_traceroute_LDADD = i3/chord/libchord.a
-i3_chord_gen_conf_LDADD         = i3/chord/libchord.a
-i3_chord_gen_conf_same_LDADD    = i3/chord/libchord.a
-i3_chord_test_LDADD             = i3/chord/libchord.a
+i3_chord_chord_getfingers_LDADD = i3/chord/libchord.la
+i3_chord_chord_traceroute_LDADD = i3/chord/libchord.la
+i3_chord_gen_conf_LDADD         = i3/chord/libchord.la
+i3_chord_gen_conf_same_LDADD    = i3/chord/libchord.la
+i3_chord_test_LDADD             = i3/chord/libchord.la
 
 CLEANFILES = tools/hipdnsproxy tools/hipdnskeyparse
 
@@ -517,7 +507,7 @@
 %.ho: %.h
        $(CC) -I$(srcdir) -I$(builddir) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) 
$(CFLAGS) -o $@ $<
 
-i3/i3/i3_config.o lib/dht/libhipdhtxml.lo: CFLAGS += `xml2-config --cflags`
+i3/i3/i3_config.lo lib/dht/libhipdhtxml.lo: CFLAGS += `xml2-config --cflags`
 lib/gui/%: CFLAGS += @GTK_CFLAGS@ -Wno-strict-prototypes
 
 .PHONY: bin checkheaders deb doxygen increl olddeb rpm syncrepo

Other related posts:

  • » [hipl-commit] [trunk] Rev 4202: Use libtool to build i3-related libraries, like we do for all other components. - Diego Biurrun