~ubuntu-branches/debian/stretch/colord/stretch

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Christopher James Halse Rogers
  • Date: 2015-08-13 08:56:11 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20150813085611-946sqkendiafealo
Tags: 1.2.11-1
* Add missing GFDL licence for documentation
* Merge new upstream 1.2.11 release. (Closes: 782477)
* Cherry pick commit to check for, and prefer, libsystemd over
  libsystemd-login. (Closes: 779777)
* debian/libcolorhug2.symbols: Add new ch_device_close symbol.
* Remove no-longer-used colord.conf (Closes: 751212)
* Add new symbols to libcolord-private symbols file
* Add new functions to libcolorhug2 symbols file
* Add newly-introduced symbols to symbols file
* Update DEP8 control for libtool-bin split
* Output better logs on DEP8 failures
* Add colord-sensor-argyll package
* Disable strangely-failing DEP8 test

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
AM_CPPFLAGS =                                           \
13
13
        $(PIE_CFLAGS)                                   \
14
14
        $(GLIB_CFLAGS)                                  \
 
15
        $(GLIB_UNIX_CFLAGS)                             \
15
16
        $(POLKIT_CFLAGS)                                \
16
17
        $(LCMS_CFLAGS)                                  \
17
18
        $(GUDEV_CFLAGS)                                 \
105
106
        $(GUSB_LIBS)                                    \
106
107
        $(LIBSYSTEMD_LOGIN_LIBS)                        \
107
108
        $(COLORD_PRIVATE_LIBS)                          \
108
 
        $(GLIB_LIBS)
 
109
        $(GLIB_LIBS)                                    \
 
110
        $(GLIB_UNIX_LIBS)
109
111
 
110
112
colord_LDFLAGS =                                        \
111
113
        $(PIE_LDFLAGS)                                  \
152
154
        $(LCMS_LIBS)                                    \
153
155
        $(SQLITE_LIBS)                                  \
154
156
        $(LIBSYSTEMD_LOGIN_LIBS)                        \
155
 
        $(GLIB_LIBS)
 
157
        $(GLIB_LIBS)                                    \
 
158
        $(GLIB_UNIX_LIBS)
156
159
 
157
160
cd_self_test_CFLAGS = $(WARNINGFLAGS_C)
158
161