patch-Makefile_in 6.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118
  1. --- udev-151.orig/Makefile.in 2010-01-27 09:34:59.000000000 +0100
  2. +++ udev-151/Makefile.in 2010-03-17 22:14:17.343159812 +0100
  3. @@ -48,7 +48,6 @@ sbin_PROGRAMS = udev/udevd$(EXEEXT) udev
  4. check_PROGRAMS = libudev/test-libudev$(EXEEXT) udev/test-udev$(EXEEXT)
  5. libexec_PROGRAMS = extras/firmware/firmware$(EXEEXT) \
  6. extras/ata_id/ata_id$(EXEEXT) \
  7. - extras/cdrom_id/cdrom_id$(EXEEXT) \
  8. extras/collect/collect$(EXEEXT) extras/edd_id/edd_id$(EXEEXT) \
  9. extras/floppy/create_floppy_devices$(EXEEXT) \
  10. extras/input_id/input_id$(EXEEXT) \
  11. @@ -221,11 +220,6 @@ PROGRAMS = $(libexec_PROGRAMS) $(sbin_PR
  12. am_extras_ata_id_ata_id_OBJECTS = extras/ata_id/ata_id.$(OBJEXT)
  13. extras_ata_id_ata_id_OBJECTS = $(am_extras_ata_id_ata_id_OBJECTS)
  14. extras_ata_id_ata_id_DEPENDENCIES = libudev/libudev-private.la
  15. -am_extras_cdrom_id_cdrom_id_OBJECTS = \
  16. - extras/cdrom_id/cdrom_id.$(OBJEXT)
  17. -extras_cdrom_id_cdrom_id_OBJECTS = \
  18. - $(am_extras_cdrom_id_cdrom_id_OBJECTS)
  19. -extras_cdrom_id_cdrom_id_DEPENDENCIES = libudev/libudev-private.la
  20. am_extras_collect_collect_OBJECTS = extras/collect/collect.$(OBJEXT)
  21. extras_collect_collect_OBJECTS = $(am_extras_collect_collect_OBJECTS)
  22. extras_collect_collect_DEPENDENCIES = libudev/libudev-private.la
  23. @@ -366,7 +360,6 @@ SOURCES = $(extras_gudev_libgudev_1_0_la
  24. $(dist_extras_gudev_libgudev_1_0_la_SOURCES) \
  25. $(libudev_libudev_private_la_SOURCES) \
  26. $(libudev_libudev_la_SOURCES) $(extras_ata_id_ata_id_SOURCES) \
  27. - $(extras_cdrom_id_cdrom_id_SOURCES) \
  28. $(extras_collect_collect_SOURCES) \
  29. $(extras_edd_id_edd_id_SOURCES) \
  30. $(extras_firmware_firmware_SOURCES) \
  31. @@ -390,7 +383,6 @@ DIST_SOURCES = $(am__extras_gudev_libgud
  32. $(am__dist_extras_gudev_libgudev_1_0_la_SOURCES_DIST) \
  33. $(am__libudev_libudev_private_la_SOURCES_DIST) \
  34. $(libudev_libudev_la_SOURCES) $(extras_ata_id_ata_id_SOURCES) \
  35. - $(extras_cdrom_id_cdrom_id_SOURCES) \
  36. $(extras_collect_collect_SOURCES) \
  37. $(extras_edd_id_edd_id_SOURCES) \
  38. $(extras_firmware_firmware_SOURCES) \
  39. @@ -477,7 +469,6 @@ am__dist_udevrules_DATA_DIST = rules/rul
  40. extras/rule_generator/75-cd-aliases-generator.rules \
  41. extras/rule_generator/75-persistent-net-generator.rules \
  42. extras/firmware/50-firmware.rules \
  43. - extras/cdrom_id/60-cdrom_id.rules \
  44. extras/edd_id/61-persistent-storage-edd.rules \
  45. extras/floppy/60-floppy.rules \
  46. extras/fstab_import/79-fstab_import.rules \
  47. @@ -748,7 +739,6 @@ dist_udevrules_DATA = rules/rules.d/50-u
  48. extras/rule_generator/75-cd-aliases-generator.rules \
  49. extras/rule_generator/75-persistent-net-generator.rules \
  50. extras/firmware/50-firmware.rules \
  51. - extras/cdrom_id/60-cdrom_id.rules \
  52. extras/edd_id/61-persistent-storage-edd.rules \
  53. extras/floppy/60-floppy.rules \
  54. extras/fstab_import/79-fstab_import.rules \
  55. @@ -820,12 +810,6 @@ extras_ata_id_ata_id_SOURCES = extras/at
  56. extras_ata_id_ata_id_LDADD = libudev/libudev-private.la
  57. # ------------------------------------------------------------------------------
  58. -# cdrom_id - optical drive/media capability
  59. -# ------------------------------------------------------------------------------
  60. -extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c
  61. -extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la
  62. -
  63. -# ------------------------------------------------------------------------------
  64. # collect - trigger action when a collection of devices appeared
  65. # ------------------------------------------------------------------------------
  66. extras_collect_collect_SOURCES = extras/collect/collect.c
  67. @@ -1314,17 +1298,6 @@ extras/ata_id/ata_id.$(OBJEXT): extras/a
  68. extras/ata_id/ata_id$(EXEEXT): $(extras_ata_id_ata_id_OBJECTS) $(extras_ata_id_ata_id_DEPENDENCIES) extras/ata_id/$(am__dirstamp)
  69. @rm -f extras/ata_id/ata_id$(EXEEXT)
  70. $(AM_V_CCLD)$(LINK) $(extras_ata_id_ata_id_OBJECTS) $(extras_ata_id_ata_id_LDADD) $(LIBS)
  71. -extras/cdrom_id/$(am__dirstamp):
  72. - @$(MKDIR_P) extras/cdrom_id
  73. - @: > extras/cdrom_id/$(am__dirstamp)
  74. -extras/cdrom_id/$(DEPDIR)/$(am__dirstamp):
  75. - @$(MKDIR_P) extras/cdrom_id/$(DEPDIR)
  76. - @: > extras/cdrom_id/$(DEPDIR)/$(am__dirstamp)
  77. -extras/cdrom_id/cdrom_id.$(OBJEXT): extras/cdrom_id/$(am__dirstamp) \
  78. - extras/cdrom_id/$(DEPDIR)/$(am__dirstamp)
  79. -extras/cdrom_id/cdrom_id$(EXEEXT): $(extras_cdrom_id_cdrom_id_OBJECTS) $(extras_cdrom_id_cdrom_id_DEPENDENCIES) extras/cdrom_id/$(am__dirstamp)
  80. - @rm -f extras/cdrom_id/cdrom_id$(EXEEXT)
  81. - $(AM_V_CCLD)$(LINK) $(extras_cdrom_id_cdrom_id_OBJECTS) $(extras_cdrom_id_cdrom_id_LDADD) $(LIBS)
  82. extras/collect/$(am__dirstamp):
  83. @$(MKDIR_P) extras/collect
  84. @: > extras/collect/$(am__dirstamp)
  85. @@ -1598,7 +1571,6 @@ uninstall-dist_libexecSCRIPTS:
  86. mostlyclean-compile:
  87. -rm -f *.$(OBJEXT)
  88. -rm -f extras/ata_id/ata_id.$(OBJEXT)
  89. - -rm -f extras/cdrom_id/cdrom_id.$(OBJEXT)
  90. -rm -f extras/collect/collect.$(OBJEXT)
  91. -rm -f extras/edd_id/edd_id.$(OBJEXT)
  92. -rm -f extras/firmware/firmware.$(OBJEXT)
  93. @@ -1670,7 +1642,6 @@ distclean-compile:
  94. -rm -f *.tab.c
  95. @AMDEP_TRUE@@am__include@ @am__quote@extras/ata_id/$(DEPDIR)/ata_id.Po@am__quote@
  96. -@AMDEP_TRUE@@am__include@ @am__quote@extras/cdrom_id/$(DEPDIR)/cdrom_id.Po@am__quote@
  97. @AMDEP_TRUE@@am__include@ @am__quote@extras/collect/$(DEPDIR)/collect.Po@am__quote@
  98. @AMDEP_TRUE@@am__include@ @am__quote@extras/edd_id/$(DEPDIR)/edd_id.Po@am__quote@
  99. @AMDEP_TRUE@@am__include@ @am__quote@extras/firmware/$(DEPDIR)/firmware.Po@am__quote@
  100. @@ -1931,7 +1902,6 @@ mostlyclean-libtool:
  101. clean-libtool:
  102. -rm -rf .libs _libs
  103. -rm -rf extras/ata_id/.libs extras/ata_id/_libs
  104. - -rm -rf extras/cdrom_id/.libs extras/cdrom_id/_libs
  105. -rm -rf extras/collect/.libs extras/collect/_libs
  106. -rm -rf extras/edd_id/.libs extras/edd_id/_libs
  107. -rm -rf extras/firmware/.libs extras/firmware/_libs
  108. @@ -2729,8 +2699,6 @@ distclean-generic:
  109. -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
  110. -rm -f extras/ata_id/$(DEPDIR)/$(am__dirstamp)
  111. -rm -f extras/ata_id/$(am__dirstamp)
  112. - -rm -f extras/cdrom_id/$(DEPDIR)/$(am__dirstamp)
  113. - -rm -f extras/cdrom_id/$(am__dirstamp)
  114. -rm -f extras/collect/$(DEPDIR)/$(am__dirstamp)
  115. -rm -f extras/collect/$(am__dirstamp)
  116. -rm -f extras/edd_id/$(DEPDIR)/$(am__dirstamp)