1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
|
Fix the compilation when libtool version > 1.9b
This patch by Arne Götje <arne@linux.org.tw>.
Index: mensis-0.0.080507/Makefile.in
===================================================================
--- mensis-0.0.080507.orig/Makefile.in
+++ mensis-0.0.080507/Makefile.in
@@ -39,12 +39,14 @@
all: mensis-en.ui mensis
mensis: $(mensis_OBJECTS)
- $(LIBTOOL) $(CC) -o mensis $(mensis_OBJECTS) stamp.c $(LIBS)
+ $(LIBTOOL) --mode=compile $(CC) -c stamp.c
+ $(LIBTOOL) --mode=link $(CC) -o mensis $(mensis_OBJECTS) stamp.lo $(LIBS)
#this makes all the .ui files but wildcarding doesn't work too well if the
# files don't exist.
nomen.h mensis-ui.c mensis-en.ui: $(srcdir)/nomen-*.c makenomenh.c
- $(LIBTOOL) $(CC) -o makenomenh $(CFLAGS) $(srcdir)/makenomenh.c $(LIBS)
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/makenomenh.c
+ $(LIBTOOL) --mode=link $(CC) -o makenomenh $(CFLAGS) $(srcdir)/makenomenh.lo $(LIBS)
-ln -s $(srcdir)/nomen-*.c .
./makenomenh mensis Mensis
mv mensis-ui-en.c mensis-ui.c
@@ -60,7 +62,8 @@
mkdir -p $(bindir)
mkdir -p $(mandir)/man1
mkdir -p $(sharedir)
- $(LIBTOOL) $(INSTALL) -c mensis $(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -c mensis $(bindir)
+ $(LIBTOOL) --mode=finish $(bindir)
cp mensis-*.ui $(sharedir)
cp $(srcdir)/mensis.1 $(mandir)/man1
Index: mensis-0.0.080507/Makefile.dynamic.in
===================================================================
--- mensis-0.0.080507.orig/Makefile.dynamic.in
+++ mensis-0.0.080507/Makefile.dynamic.in
@@ -37,12 +37,14 @@
all: mensis-en.ui mensis
mensis: $(mensis_OBJECTS)
- $(LIBTOOL) $(CC) -o mensis $(mensis_OBJECTS) stamp.c $(LIBS)
+ $(LIBTOOL) --mode=compile $(CC) -c stamp.c
+ $(LIBTOOL) --mode=link $(CC) -o mensis $(mensis_OBJECTS) stamp.lo $(LIBS)
#this makes all the .ui files but wildcarding doesn't work too well if the
# files don't exist.
nomen.h mensis-ui.c mensis-en.ui: $(srcdir)/nomen-*.c makenomenh.c
- $(LIBTOOL) $(CC) -o makenomenh $(CFLAGS) $(srcdir)/makenomenh.c $(LIBS)
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(srcdir)/makenomenh.c
+ $(LIBTOOL) --mode=link $(CC) -o makenomenh $(CFLAGS) $(srcdir)/makenomenh.lo $(LIBS)
-ln -s $(srcdir)/nomen-*.c .
./makenomenh mensis Mensis
mv mensis-ui-en.c mensis-ui.c
@@ -58,7 +60,8 @@
mkdir -p $(bindir)
mkdir -p $(mandir)/man1
mkdir -p $(sharedir)
- $(LIBTOOL) $(INSTALL) -c mensis $(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -c mensis $(bindir)
+ $(LIBTOOL) --mode=finish $(bindir)
cp mensis-*.ui $(sharedir)
cp $(srcdir)/mensis.1 $(mandir)/man1
Index: mensis-0.0.080507/Makefile.static.in
===================================================================
--- mensis-0.0.080507.orig/Makefile.static.in
+++ mensis-0.0.080507/Makefile.static.in
@@ -47,7 +47,8 @@
mkdir -p $(bindir)
mkdir -p $(mandir)/man1
mkdir -p $(sharedir)
- $(LIBTOOL) $(INSTALL) -c mensis $(bindir)
+ $(LIBTOOL) --mode=install $(INSTALL) -c mensis $(bindir)
+ $(LIBTOOL) --mode=finish $(bindir)
cp mensis-*.ui $(sharedir)
cp $(srcdir)/mensis.1 $(mandir)/man1
|