[hipl-commit] [trunk] Rev 4158: Factorize the setting of libxml-related CFLAGS.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 7 Apr 2010 18:30:20 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 07/04/2010 at 18:30:20
Revision: 4158
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Factorize the setting of libxml-related CFLAGS.

Modified:
  M  Makefile.am

=== modified file 'Makefile.am'
--- Makefile.am 2010-04-07 14:44:44 +0000
+++ Makefile.am 2010-04-07 15:30:04 +0000
@@ -303,9 +303,6 @@
 lib_opphip_libopphip_la_SOURCES  = lib/opphip/wrap.c \
                                    lib/opphip/wrap_db.c
 
-# NOTE: this would overwrite AM_CFLAGS, so we need to append it
-lib_dht_libhipdht_la_CFLAGS = `xml2-config --cflags` @AM_CFLAGS@
-
 lib_dht_libhipdht_la_SOURCES = lib/dht/libhipdht.c      \
                                lib/dht/libhipdhtxml.c
 
@@ -340,9 +337,6 @@
 i3_chord_gen_conf_same_SOURCES = i3/chord/gen_conf_same.c
 i3_chord_test_SOURCES          = i3/chord/test.c
 
-# NOTE: this would overwrite AM_CFLAGS, so we need to append it
-i3_i3_libi3_a_CFLAGS = `xml2-config --cflags` @AM_CFLAGS@
-
 i3_i3_libi3_a_SOURCES = i3/i3/i3_addr.c     \
                         i3/i3/i3_api.c      \
                         i3/i3/i3_config.c   \
@@ -626,6 +620,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`
 lib/gui/%: CFLAGS += @GTK_CFLAGS@ -Wno-strict-prototypes
 
 .PHONY: bin checkheaders deb doxygen increl olddeb rpm syncrepo

Other related posts:

  • » [hipl-commit] [trunk] Rev 4158: Factorize the setting of libxml-related CFLAGS. - Diego Biurrun