← Back to branch summary

~ubuntu-branches/ubuntu/precise/vino/precise-proposed-201205170738

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2011-09-02 08:10:47 UTC
  • mfrom: (1.1.52 upstream)
  • Revision ID: package-import@ubuntu.com-20110902081047-vfofquvdgrnfyz2f
Tags: 3.1.90-0ubuntu1
* New upstream release.
* debian/control: Add libminiupnpc-dev to build dependencies
* debian/patches/05_use-system-miniupnpc.patch
  - Use system miniupnpc library, not the bundled copy

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
25
25
        server/smclient/eggdesktopfile.c \
26
26
        server/smclient/eggdesktopfile.h
27
27
 
28
 
VINO_MINIUPNP_cppflags = -DNDEBUG
29
 
 
30
 
VINO_MINIUPNP_sources = \
31
 
        server/miniupnp/bsdqueue.h \
32
 
        server/miniupnp/codelength.h \
33
 
        server/miniupnp/declspec.h \
34
 
        server/miniupnp/igd_desc_parse.c \
35
 
        server/miniupnp/igd_desc_parse.h \
36
 
        server/miniupnp/minisoap.c \
37
 
        server/miniupnp/minisoap.h \
38
 
        server/miniupnp/minissdpc.c \
39
 
        server/miniupnp/minissdpc.h \
40
 
        server/miniupnp/miniupnpc.c \
41
 
        server/miniupnp/miniupnpc.h \
42
 
        server/miniupnp/miniwget.c \
43
 
        server/miniupnp/miniwget.h \
44
 
        server/miniupnp/minixml.c \
45
 
        server/miniupnp/minixml.h \
46
 
        server/miniupnp/upnpcommands.c \
47
 
        server/miniupnp/upnpcommands.h \
48
 
        server/miniupnp/upnpreplyparse.c \
49
 
        server/miniupnp/upnpreplyparse.h
50
 
 
51
28
if VINO_HAVE_SELF_IFADDRS
52
29
VINO_IFADDRS_sources = \
53
30
        server/libvncserver/ifaddr/getifaddrs.c \
90
67
        -I$(top_srcdir) \
91
68
        -I$(top_srcdir)/common \
92
69
        -I$(top_srcdir)/server/libvncserver \
93
 
        -I$(top_srcdir)/server/miniupnp \
94
70
        -I$(top_srcdir)/server/smclient \
95
71
        -I$(top_builddir) \
96
72
        -I$(top_builddir)/server \
97
73
        $(VINO_SERVER_CFLAGS) \
98
 
        $(VINO_MINIUPNP_cppflags) \
99
74
        $(LIBGCRYPT_CFLAGS) \
100
75
        $(WARN_CFLAGS) \
101
76
        $(DISABLE_DEPRECATED) \
111
86
        $(VINO_SERVER_LIBS) \
112
87
        $(LIBGCRYPT_LIBS) \
113
88
        $(JPEG_LIBS) \
 
89
        $(LIBUPNP_LIBS) \
114
90
        $(X_LIBS) $(XTEST_LIBS) $(XSHM_LIBS) $(XDAMAGE_LIBS) $(ZLIB_LIBS)
115
91
 
116
92
if VINO_ENABLE_HTTP_SERVER
163
139
        server/vino-dbus-error.h \
164
140
        server/vino-upnp.h \
165
141
        server/vino-upnp.c \
166
 
        $(VINO_MINIUPNP_sources) \
167
142
        $(VINO_IFADDR_sources) \
168
143
        $(VINO_LIBVNCSERVER_sources) \
169
144
        $(VINO_HTTP_sources) \
336
311
        server/libvncserver/tabletranstemplate.c \
337
312
        server/libvncserver/tableinitcmtemplate.c \
338
313
        server/libvncserver/zrleencodetemplate.c \
339
 
        server/miniupnp/README \
340
 
        server/miniupnp/LICENCE \
341
314
        \
342
315
        ChangeLog.pre-git \
343
316
        intltool-extract.in \