diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-09-23 22:11:37 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-09-23 22:11:37 +0000 |
| commit | 828446fcb6e397de339f36ace9e84ac608c16c06 (patch) | |
| tree | 016a54fcb06e4e57e78a429ae8e9e473db614ca9 /GNUmakefile | |
| parent | 0b1d0f960b66463943492d1123e82fe550d36e8d (diff) | |
| download | netpbm-mirror-828446fcb6e397de339f36ace9e84ac608c16c06.tar.gz netpbm-mirror-828446fcb6e397de339f36ace9e84ac608c16c06.tar.xz netpbm-mirror-828446fcb6e397de339f36ace9e84ac608c16c06.zip | |
Fix build with separate build directory
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@67 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 420d558c..0f5c04fd 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -102,13 +102,13 @@ TYPEGEN = $(BUILDDIR)/buildtools/typegen # endiangen is a utility program used by the make file below. ENDIANGEN = $(BUILDDIR)/buildtools/endiangen -$(TYPEGEN): $(BUILDDIR)/buildtools +$(TYPEGEN) $(ENDIANGEN): $(BUILDDIR)/buildtools $(MAKE) -C $(dir $@) -f $(SRCDIR)/buildtools/Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) DELETEIT = (rm -f $@ || false) -$(BUILDDIR)/inttypes_netpbm.h: $(TYPEGEN) +inttypes_netpbm.h: $(TYPEGEN) $(TYPEGEN) >$@ || $(DELETEIT) # We run a couple of programs on the build machine in computing the @@ -116,7 +116,7 @@ $(BUILDDIR)/inttypes_netpbm.h: $(TYPEGEN) # that or to override the results, because it doesn't work if he's # cross compiling. -$(BUILDDIR)/pm_config.h: \ +pm_config.h: \ $(SRCDIR)/pm_config.in.h Makefile.config inttypes_netpbm.h \ $(ENDIANGEN) echo '/* pm_config.h GENERATED BY A MAKE RULE */' >$@ || $(DELETEIT) @@ -145,7 +145,7 @@ endif MAJOR := $(NETPBM_MAJOR_RELEASE) MINOR := $(NETPBM_MINOR_RELEASE) POINT := $(NETPBM_POINT_RELEASE) -$(BUILDDIR)/version.h: +version.h: @rm -f $@ @echo "/* Generated by make file rule */" >$@ @echo "#define NETPBM_VERSION" \ @@ -350,7 +350,7 @@ install.hdr: $(PKGDIR)/include $(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.hdr $(INSTALL) -c -m $(INSTALL_PERM_HDR) \ - $(SRCDIR)/pm_config.h $(PKGDIR)/include + $(BUILDDIR)/pm_config.h $(PKGDIR)/include ifeq ($(STATICLIB_TOO),y) BUILD_STATIC = y |