diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2006-04-09 08:41:55 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2006-04-09 08:41:55 -0400 |
| commit | 4ea7ea007bb227727ee1d4dca997c4f5b21d3a30 (patch) | |
| tree | a984da943ed78f0b99fa22834495255619f8a61e /Makefile.in | |
| parent | cef2ac104d45c351344cd10ac1419ad5f6422d8b (diff) | |
| download | android_external_e2fsprogs-4ea7ea007bb227727ee1d4dca997c4f5b21d3a30.tar.gz android_external_e2fsprogs-4ea7ea007bb227727ee1d4dca997c4f5b21d3a30.tar.bz2 android_external_e2fsprogs-4ea7ea007bb227727ee1d4dca997c4f5b21d3a30.zip | |
Fix asm_types.h type conflicts
This caused FTBFS bugs on AMD64 platforms, since it uses a different
64-bit type when compared with IA64, so we need to make our
autoconfiguration system more intelligent.
Addresses Debian Bugs: #360661, #360317
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index abbd5a84..88d6c3ad 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,20 +100,17 @@ realclean: realclean-recursive realclean-local depend:: depend-recursive -lib/ext2fs/ext2_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in - @echo " SUBST $@" - @$(SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in \ - > lib/ext2fs/ext2_types.h - -lib/blkid/blkid_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in - @echo " SUBST $@" - @$(SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in \ - > lib/blkid/blkid_types.h - -lib/uuid/uuid_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in - @echo " SUBST $@" - @$(SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in \ - > lib/uuid/uuid_types.h +lib/ext2fs/ext2_types.h: $(DEP_SUBSTITUTE) asm_types.h \ + $(srcdir)/lib/ext2fs/ext2_types.h.in + cd $(top_builddir); CONFIG_FILES=./lib/ext2fs/ext2_types.h ./config.status + +lib/blkid/blkid_types.h: $(DEP_SUBSTITUTE) asm_types.h \ + $(srcdir)/lib/blkid/blkid_types.h.in + cd $(top_builddir); CONFIG_FILES=./lib/blkid/blkid_types.h ./config.status + +lib/uuid/uuid_types.h: $(DEP_SUBSTITUTE) asm_types.h \ + $(srcdir)/lib/uuid/uuid_types.h.in + cd $(top_builddir); CONFIG_FILES=./lib/uuid/uuid_types.h ./config.status mostlyclean-local: $(RM) -f \#* *~ *.orig core MAKELOG |