[fontutils-commits] fontutils GNUmakefile.in

[Adam M. Dutko]

CVSROOT:        /sources/fontutils
Module name:    fontutils
Changes by:     Adam M. Dutko <styluseater>     11/09/15 14:06:42

Modified files:
        .              : GNUmakefile.in 

Log message:
        Only include libraries if they are present. Adjust path of code to be 
relative to srcdir.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/fontutils/GNUmakefile.in?cvsroot=fontutils&r1=1.4&r2=1.5

Patches:
Index: GNUmakefile.in
===================================================================
RCS file: /sources/fontutils/fontutils/GNUmakefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- GNUmakefile.in      8 Feb 2011 02:41:49 -0000       1.4
+++ GNUmakefile.in      15 Sep 2011 14:06:42 -0000      1.5
@@ -101,19 +101,29 @@
 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)"
+endif
+
 
 all: libraries
        for dir in $(programs);                                         \