diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | rules/95-devkit-power-battery-recall-dell.rules (renamed from src/95-devkit-power-battery-recall-dell.rules) | 0 | ||||
| -rw-r--r-- | rules/95-devkit-power-battery-recall-fujitsu.rules (renamed from src/95-devkit-power-battery-recall-fujitsu.rules) | 0 | ||||
| -rw-r--r-- | rules/95-devkit-power-battery-recall-gateway.rules (renamed from src/95-devkit-power-battery-recall-gateway.rules) | 0 | ||||
| -rw-r--r-- | rules/95-devkit-power-battery-recall-ibm.rules (renamed from src/95-devkit-power-battery-recall-ibm.rules) | 0 | ||||
| -rw-r--r-- | rules/95-devkit-power-battery-recall-lenovo.rules (renamed from src/95-devkit-power-battery-recall-lenovo.rules) | 0 | ||||
| -rw-r--r-- | rules/95-devkit-power-battery-recall-toshiba.rules (renamed from src/95-devkit-power-battery-recall-toshiba.rules) | 0 | ||||
| -rw-r--r-- | rules/95-devkit-power-csr.rules (renamed from src/95-devkit-power-csr.rules) | 0 | ||||
| -rw-r--r-- | rules/95-devkit-power-hid.rules (renamed from src/95-devkit-power-hid.rules) | 0 | ||||
| -rw-r--r-- | rules/95-devkit-power-wup.rules (renamed from src/95-devkit-power-wup.rules) | 0 | ||||
| -rw-r--r-- | rules/Makefile.am | 20 | ||||
| -rw-r--r-- | src/Makefile.am | 13 |
13 files changed, 22 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 2a80cda..95bc714 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = devkit-power-gobject src doc tools policy po +SUBDIRS = devkit-power-gobject src doc tools policy po rules # Creating ChangeLog from git log (taken from cairo/Makefile.am): ChangeLog: $(srcdir)/ChangeLog diff --git a/configure.ac b/configure.ac index f06b4e1..5c1824e 100644 --- a/configure.ac +++ b/configure.ac @@ -189,6 +189,7 @@ doc/version.xml doc/man/Makefile doc/dbus/Makefile policy/Makefile +rules/Makefile devkit-power-gobject/Makefile devkit-power-gobject/dkp-version.h po/Makefile.in diff --git a/src/95-devkit-power-battery-recall-dell.rules b/rules/95-devkit-power-battery-recall-dell.rules index a9eeabb..a9eeabb 100644 --- a/src/95-devkit-power-battery-recall-dell.rules +++ b/rules/95-devkit-power-battery-recall-dell.rules diff --git a/src/95-devkit-power-battery-recall-fujitsu.rules b/rules/95-devkit-power-battery-recall-fujitsu.rules index 7d95e36..7d95e36 100644 --- a/src/95-devkit-power-battery-recall-fujitsu.rules +++ b/rules/95-devkit-power-battery-recall-fujitsu.rules diff --git a/src/95-devkit-power-battery-recall-gateway.rules b/rules/95-devkit-power-battery-recall-gateway.rules index fe08a4e..fe08a4e 100644 --- a/src/95-devkit-power-battery-recall-gateway.rules +++ b/rules/95-devkit-power-battery-recall-gateway.rules diff --git a/src/95-devkit-power-battery-recall-ibm.rules b/rules/95-devkit-power-battery-recall-ibm.rules index ecff4fb..ecff4fb 100644 --- a/src/95-devkit-power-battery-recall-ibm.rules +++ b/rules/95-devkit-power-battery-recall-ibm.rules diff --git a/src/95-devkit-power-battery-recall-lenovo.rules b/rules/95-devkit-power-battery-recall-lenovo.rules index 536630f..536630f 100644 --- a/src/95-devkit-power-battery-recall-lenovo.rules +++ b/rules/95-devkit-power-battery-recall-lenovo.rules diff --git a/src/95-devkit-power-battery-recall-toshiba.rules b/rules/95-devkit-power-battery-recall-toshiba.rules index 4a20a57..4a20a57 100644 --- a/src/95-devkit-power-battery-recall-toshiba.rules +++ b/rules/95-devkit-power-battery-recall-toshiba.rules diff --git a/src/95-devkit-power-csr.rules b/rules/95-devkit-power-csr.rules index c14e323..c14e323 100644 --- a/src/95-devkit-power-csr.rules +++ b/rules/95-devkit-power-csr.rules diff --git a/src/95-devkit-power-hid.rules b/rules/95-devkit-power-hid.rules index 464aefa..464aefa 100644 --- a/src/95-devkit-power-hid.rules +++ b/rules/95-devkit-power-hid.rules diff --git a/src/95-devkit-power-wup.rules b/rules/95-devkit-power-wup.rules index f42c6d0..f42c6d0 100644 --- a/src/95-devkit-power-wup.rules +++ b/rules/95-devkit-power-wup.rules diff --git a/rules/Makefile.am b/rules/Makefile.am new file mode 100644 index 0000000..f7af3ae --- /dev/null +++ b/rules/Makefile.am @@ -0,0 +1,20 @@ +## Process this file with automake to produce Makefile.in + +udevrulesdir = $(slashlibdir)/udev/rules.d +udevrules_DATA = \ + 95-devkit-power-battery-recall-dell.rules \ + 95-devkit-power-battery-recall-fujitsu.rules \ + 95-devkit-power-battery-recall-gateway.rules \ + 95-devkit-power-battery-recall-ibm.rules \ + 95-devkit-power-battery-recall-lenovo.rules \ + 95-devkit-power-battery-recall-toshiba.rules \ + 95-devkit-power-wup.rules \ + 95-devkit-power-hid.rules \ + 95-devkit-power-csr.rules + +EXTRA_DIST = \ + $(udevrules_DATA) + +clean-local : + rm -f *~ + diff --git a/src/Makefile.am b/src/Makefile.am index bef1213..14f68de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,18 +109,6 @@ dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf) $(dbusconf_DATA): $(dbusconf_in_files) Makefile cp $< $@ -udevrulesdir = $(slashlibdir)/udev/rules.d -udevrules_DATA = \ - 95-devkit-power-battery-recall-dell.rules \ - 95-devkit-power-battery-recall-fujitsu.rules \ - 95-devkit-power-battery-recall-gateway.rules \ - 95-devkit-power-battery-recall-ibm.rules \ - 95-devkit-power-battery-recall-lenovo.rules \ - 95-devkit-power-battery-recall-toshiba.rules \ - 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; \ @@ -134,7 +122,6 @@ EXTRA_DIST = \ org.freedesktop.DeviceKit.Power.QoS.xml \ org.freedesktop.DeviceKit.Power.Wakeups.xml \ dkp-marshal.list \ - $(udevrules_DATA) \ $(service_in_files) \ $(dbusconf_in_files) |