diff options
| author | styluseater <styluseater> | 2011-09-15 14:06:42 +0000 |
|---|---|---|
| committer | styluseater <styluseater> | 2011-09-15 14:06:42 +0000 |
| commit | 6a3d1a57df487039b9f0c25c02d69bfcd7709b05 (patch) | |
| tree | 22b315331d3d85011f219df9136c861202777d58 | |
| parent | 222225573ed2ee2bfd774c300a87661047cbc8be (diff) | |
| download | fontutils-6a3d1a57df487039b9f0c25c02d69bfcd7709b05.tar.gz | |
Only include libraries if they are present. Adjust path of code to be relative to srcdir.
| -rw-r--r-- | GNUmakefile.in | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index 274d047..b23619d 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -101,19 +101,29 @@ widgets = widgets xbfe = xbfe endif -libraries = gf lib pbm pk tfm -programs = charspace fontconvert imageto -alldirs = $(libraries) $(programs) doc +libraries = $(srcdir)/gf $(srcdir)/lib $(srcdir)/pbm $(srcdir)/pk $(srcdir)/tfm +programs = $(srcdir)/charspace $(srcdir)/fontconvert $(srcdir)/imageto +alldirs = $(libraries) $(programs) $(srcdir)/doc default: all .PHONY: all install libraries clean distclean extraclean realclean depend dist +ifeq "$(xincdir)" "" + ifeq "$(xlibdirp)" "" + makeargs = $(MFLAGS) \ + SHELL="$(SHELL)" CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + LIBS="$(LIBS)" RANLIB="$(RANLIB)" srcdir=$(srcdir) \ + wlibs="$(wlibs)" widgets="$(widgets)" + endif +else makeargs = $(MFLAGS) \ SHELL="$(SHELL)" CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ LIBS="$(LIBS)" RANLIB="$(RANLIB)" srcdir=$(srcdir) \ wlibs="$(wlibs)" xlibdir="$(xlibdir)" xincludedir="$(xincludedir)" \ - widgets="$(widgets)" + widgets="$(widgets)" +endif + all: libraries for dir in $(programs); \ |