t1lib/trunk/lib-cleanup.diff

   1 do not link against libraries that are not needed
   2
   3 Index: t1lib-5.1.1/lib/Makefile.in
   4 ===================================================================
   5 --- t1lib-5.1.1.orig/lib/Makefile.in    2008-01-05 19:17:21.000000000 +0100
   6 +++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:17:38.000000000 +0100
   7 @@ -24,7 +24,7 @@
   8  X_LIBS    = @X_LIBS@
   9  TOPSRC    = @top_srcdir@
  10  XPM_LIB   = -lXpm
  11 -XLIB      = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
  12 +XLIB      = -lX11
  13  LDFLAGS   = @LDFLAGS@
  14  LDLIBS    = @LDLIBS@
  15  AR        = ar rc
  16 @@ -137,7 +137,7 @@
  17         $(LIBTOOL) --mode=link \
  18                 $(CC) $(LDFLAGS) -o $@ $(T1LIBX_OBJS) \
  19                  -version-info @T1LIB_LT_CURRENT@:@T1LIB_LT_REVISION@:@T1LIB_LT_AGE@ \
  20 -                libt1.la $(X_LIBS) $(XPM_LIB) $(XLIB)  -no-undefined -rpath $(libdir)
  21 +                libt1.la $(X_LIBS) $(XLIB)  -no-undefined -rpath $(libdir)
  22         cp t1lib/t1libx.h .
  23
  24
  25 Index: t1lib-5.1.1/type1afm/Makefile.in
  26 ===================================================================
  27 --- t1lib-5.1.1.orig/type1afm/Makefile.in       2008-01-05 19:17:52.000000000 +0100
  28 +++ t1lib-5.1.1/type1afm/Makefile.in    2008-01-05 19:18:02.000000000 +0100
  29 @@ -70,7 +70,7 @@
  30
  31  type1afm: $(OBJS) ../lib/t1lib.h
  32         $(LIBTOOL) --mode=link \
  33 -               $(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB) $(LDLIBS)
  34 +               $(CC) -o type1afm $(LDFLAGS) $(OBJS) $(T1LIB)
  35
  36  .SUFFIXES: .lo
  37  .c.lo:
  38 Index: t1lib-5.1.1/xglyph/Makefile.in
  39 ===================================================================
  40 --- t1lib-5.1.1.orig/xglyph/Makefile.in 2008-01-05 19:18:15.000000000 +0100
  41 +++ t1lib-5.1.1/xglyph/Makefile.in      2008-01-05 19:18:31.000000000 +0100
  42 @@ -24,7 +24,7 @@
  43  X_LIBS    = @X_LIBS@
  44  TOPSRC    = @top_srcdir@
  45  XPM_LIB   = -lXpm
  46 -XLIB      = @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
  47 +XLIB      = -lX11 @X_EXTRA_LIBS@
  48  LDFLAGS   = @LDFLAGS@
  49  LDLIBS    = @LDLIBS@
  50  AR        = ar rc
  51 @@ -65,7 +65,7 @@
  52
  53  T1LIB  = ../lib/libt1.la
  54  T1LIBX = ../lib/libt1x.la
  55 -XAWLIB = -lXaw -lXt -lXmu
  56 +XAWLIB = -lXaw -lXt
  57
  58
  59  all: xglyph