Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../advanced/GNUmakefile ./GNUmakefile |
2 | --- ../advanced/GNUmakefile 2014-12-29 02:10:40.608106336 -0500 | |
3 | +++ ./GNUmakefile 2014-12-29 02:29:28.600107116 -0500 | |
4 | @@ -121,18 +121,8 @@ | |
5 | $(SRCDIR)/configure $(SRCDIR)/config.mk.in | |
6 | ||
7 | ||
8 | -# typegen is a utility program used by the make file below. | |
9 | -TYPEGEN = $(BUILDDIR)/buildtools/typegen | |
10 | - | |
11 | -# endiangen is a utility program used by the make file below. | |
12 | -ENDIANGEN = $(BUILDDIR)/buildtools/endiangen | |
13 | - | |
14 | -$(TYPEGEN) $(ENDIANGEN): $(BUILDDIR)/buildtools | |
15 | - $(MAKE) -C $(dir $@) -f $(SRCDIR)/buildtools/Makefile \ | |
16 | - SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) | |
17 | - | |
18 | inttypes_netpbm.h: $(TYPEGEN) | |
19 | - $(TYPEGEN) >$@ | |
20 | + echo 'include <inttypes.h>' > inttypes_netpbm.h | |
21 | ||
22 | # We run a couple of programs on the build machine in computing the | |
23 | # contents of pm_config.h. We need to give the user a way not to do | |
24 | @@ -147,6 +137,7 @@ | |
25 | echo '/* pm_config.h GENERATED BY A MAKE RULE */' >$@ | |
26 | echo '#ifndef PM_CONFIG_H' >>$@ | |
27 | echo '#define PM_CONFIG_H' >>$@ | |
28 | + echo '#include <sys/endian.h> /* For BYTE_ORDER on Android */' >>$@ | |
29 | ifeq ($(INTTYPES_H)x,x) | |
30 | echo '/* Dont need to #include any inttypes.h-type thing */' >>$@ | |
31 | else |