← Back to branch summary

~network-manager/network-manager/ubuntu.hardy.07

« back to all changes in this revision

Viewing changes to libnm-util/Makefile.am

* merge 0.7~~svn20080905t025540+eni0 snapshot to hardy branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libnm-util/Makefile.am
2
2
 
3
3
lib_LTLIBRARIES=libnm-util.la
4
4
 
5
 
libnm_util_la_CPPFLAGS =                                \
6
 
        $(GLIB_CFLAGS)                                  \
7
 
        $(DBUS_CFLAGS)                                  \
8
 
        -DDBUS_API_SUBJECT_TO_CHANGE            \
 
5
libnm_util_la_CPPFLAGS = \
 
6
        $(GLIB_CFLAGS) \
 
7
        $(DBUS_CFLAGS) \
 
8
        $(UUID_CFLAGS) \
 
9
        -DDBUS_API_SUBJECT_TO_CHANGE \
9
10
        -DG_DISABLE_DEPRECATED
10
11
 
11
12
libnm_util_include_HEADERS =            \
50
51
        $(libnm_util_include_HEADERS)
51
52
 
52
53
libnm_util_la_LDFLAGS= -version-info 0:0:0
53
 
libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
 
54
libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS)
 
55
 
 
56
libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver
54
57
 
55
58
if WITH_GNUTLS
56
59
libnm_util_la_SOURCES += crypto_gnutls.c
68
71
 
69
72
noinst_PROGRAMS = test-crypto
70
73
 
71
 
test_crypto_SOURCES = test-crypto.c
 
74
test_crypto_SOURCES = test-crypto.c crypto.c
72
75
test_crypto_CPPFLAGS = $(GLIB_CFLAGS) -D_GNU_SOURCE
73
76
test_crypto_LDADD = $(GLIB_LIBS) libnm-util.la
74
77
 
 
78
if WITH_GNUTLS
 
79
test_crypto_SOURCES += crypto_gnutls.c
 
80
test_crypto_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS)
 
81
test_crypto_LDADD += $(LIBGCRYPT_LIBS) $(GNUTLS_LIBS)
 
82
endif
 
83
 
 
84
if WITH_NSS
 
85
test_crypto_SOURCES += crypto_nss.c
 
86
test_crypto_CPPFLAGS += $(NSS_CFLAGS)
 
87
test_crypto_LDADD += $(NSS_LIBS)
 
88
endif
 
89
 
75
90
pkgconfigdir = $(libdir)/pkgconfig
76
91
pkgconfig_DATA = libnm-util.pc
77
92
 
78
93
DISTCLEANFILES = libnm-util.pc
79
94
 
80
 
EXTRA_DIST = \
81
 
        libnm-util.pc.in
 
95
EXTRA_DIST = libnm-util.pc.in libnm-util.ver
82
96