diff options
| author | Richard Hughes <richard@hughsie.com> | 2009-07-06 10:13:02 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2009-07-06 10:13:02 +0100 |
| commit | 161d2d50c1fd04d6b184cc6c6c13a65ae97328ca (patch) | |
| tree | 22f5b92b923edd73d45f6aac17825f3c7b00b2f6 /src/Makefile.am | |
| parent | ff42e21d331ca21e5bfd225920a774bf348a53ab (diff) | |
| parent | 86f6278f61d30e6ca97bdf421299d156b6607fda (diff) | |
| download | upower-161d2d50c1fd04d6b184cc6c6c13a65ae97328ca.tar.gz | |
Fix conflicts
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0878f25..2e51035 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,6 +12,7 @@ INCLUDES = \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ -DDKP_COMPILATION \ + -DDKP_DISABLE_DEPRECATED \ -DEGG_LOG_FILE=\""$(DKP_LOG_DIR)/DeviceKit-power"\" \ -DEGG_VERBOSE="\"DKP_VERBOSE\"" \ -DEGG_LOGGING="\"DKP_LOGGING\"" \ @@ -55,13 +56,13 @@ dkp-wakeups-glue.h: org.freedesktop.DeviceKit.Power.Wakeups.xml Makefile.am libexec_PROGRAMS = devkit-power-daemon dbusifdir = $(datadir)/dbus-1/interfaces -dbusif_DATA = \ - org.freedesktop.DeviceKit.Power.xml \ - org.freedesktop.DeviceKit.Power.Device.xml \ - org.freedesktop.DeviceKit.Power.QoS.xml \ +dbusif_DATA = \ + org.freedesktop.DeviceKit.Power.xml \ + org.freedesktop.DeviceKit.Power.Device.xml \ + org.freedesktop.DeviceKit.Power.QoS.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml -devkit_power_daemon_SOURCES = \ +devkit_power_daemon_SOURCES = \ egg-debug.c \ egg-debug.h \ dkp-polkit.h dkp-polkit.c \ @@ -80,13 +81,13 @@ devkit_power_daemon_SOURCES = \ dkp-main.c \ $(BUILT_SOURCES) -devkit_power_daemon_CPPFLAGS = \ +devkit_power_daemon_CPPFLAGS = \ -I$(top_srcdir)/src \ -DG_LOG_DOMAIN=\"dkp-daemon\" \ $(DISABLE_DEPRECATED) \ $(AM_CPPFLAGS) -devkit_power_daemon_LDADD = \ +devkit_power_daemon_LDADD = \ -lm \ $(USB_LIBS) \ $(GIO_LIBS) \ @@ -109,12 +110,6 @@ dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf) $(dbusconf_DATA): $(dbusconf_in_files) Makefile cp $< $@ -udevrulesdir = $(sysconfdir)/udev/rules.d -udevrules_DATA = \ - 95-devkit-power-wup.rules \ - 95-devkit-power-hid.rules \ - 95-devkit-power-csr.rules - install-data-hook: if test -w $(DESTDIR)$(prefix)/; then \ mkdir -p $(DESTDIR)$(localstatedir)/lib/DeviceKit-power; \ @@ -123,15 +118,12 @@ install-data-hook: CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - org.freedesktop.DeviceKit.Power.xml \ + org.freedesktop.DeviceKit.Power.xml \ org.freedesktop.DeviceKit.Power.Device.xml \ org.freedesktop.DeviceKit.Power.QoS.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml \ dkp-marshal.list \ - 95-devkit-power-csr.rules \ - 95-devkit-power-hid.rules \ - 95-devkit-power-wup.rules \ - $(service_in_files) \ + $(service_in_files) \ $(dbusconf_in_files) clean-local : |