Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | The Makefile used by shared-mime-info is one big race with the SUBDIRS |
| 2 | option and the dependency specifically calling make all combining to |
| 3 | create multiple make instances all of which may try and build targets |
| 4 | like update-mime-database. |
| 5 | |
| 6 | This patch removes those options meaning make can correctly identify |
| 7 | dependencies and stop itself racing itself. |
| 8 | |
| 9 | RP 10/10/2011 |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
| 13 | |
| 14 | Index: shared-mime-info-1.0/Makefile.am |
| 15 | =================================================================== |
| 16 | --- shared-mime-info-1.0.orig/Makefile.am |
| 17 | +++ shared-mime-info-1.0/Makefile.am |
| 18 | @@ -1,5 +1,3 @@ |
| 19 | -SUBDIRS=. po |
| 20 | - |
| 21 | AM_CPPFLAGS = $(ALL_CFLAGS) |
| 22 | |
| 23 | packagesdir = $(datadir)/mime/packages |
| 24 | @@ -72,8 +70,7 @@ uninstall-hook: |
| 25 | |
| 26 | all: $(defaultmakedeps) |
| 27 | |
| 28 | -create-pot: |
| 29 | - $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot |
| 30 | +create-pot: po |
| 31 | |
| 32 | check: create-pot freedesktop.org.xml update-mime-database check-translations |
| 33 | if test -e $(top_builddir)/freedesktop.org.xml; then \ |