Skip to content

Commit d984a63

Browse files
authored
Merge pull request #10 from mynlp/develop
do not use libtool
2 parents 3084147 + ce70c43 commit d984a63

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+2040
-63264
lines changed

INSTALL

+14-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@ where $INSTALL_DIR is the directory to install Enju.
2020

2121
For details, see "enju-manual/index.html".
2222

23+
----------------------------------------------------------------------
24+
If you need to rebuild "configure" (e.g. when you modified Makefile.am)
25+
26+
Run:
27+
% aclocal; autoheader; automake --add-missing --foreign --copy; autoconf
28+
% ./configure --enable-maintainer-mode
29+
% make
30+
2331
----------------------------------------------------------------------
2432
If you want to create grammar data from scratch:
2533

@@ -30,4 +38,9 @@ If you want to create grammar data from scratch:
3038
% tar xvzf WordNet-X.X.tar.gz
3139
% tar xvzf penn.tar.gz
3240

33-
2. Run "make"
41+
2. Run:
42+
% ./configure --with-enju-grammar
43+
% make
44+
45+
The grammar files will be created in "DATA".
46+

Makefile.in

+10-40
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ CSCOPE = cscope
198198
DIST_SUBDIRS = $(SUBDIRS)
199199
am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING INSTALL README \
200200
TODO compile config.guess config.sub depcomp install-sh \
201-
ltmain.sh missing
201+
missing
202202
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
203203
distdir = $(PACKAGE)-$(VERSION)
204204
top_distdir = $(distdir)
@@ -246,8 +246,6 @@ AMIS = @AMIS@
246246
AMTAR = @AMTAR@
247247
AM_CXXFLAGS = @AM_CXXFLAGS@
248248
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
249-
AM_LDFLAGS = @AM_LDFLAGS@
250-
AR = @AR@
251249
AUTOCONF = @AUTOCONF@
252250
AUTOHEADER = @AUTOHEADER@
253251
AUTOMAKE = @AUTOMAKE@
@@ -264,39 +262,25 @@ CXXFLAGS = @CXXFLAGS@
264262
CYGPATH_W = @CYGPATH_W@
265263
DEFS = @DEFS@
266264
DEPDIR = @DEPDIR@
267-
DLLTOOL = @DLLTOOL@
268-
DSYMUTIL = @DSYMUTIL@
269-
DUMPBIN = @DUMPBIN@
270265
ECHO_C = @ECHO_C@
271266
ECHO_N = @ECHO_N@
272267
ECHO_T = @ECHO_T@
273268
EGREP = @EGREP@
274269
EXEEXT = @EXEEXT@
275-
FGREP = @FGREP@
276270
GREP = @GREP@
277271
INSTALL = @INSTALL@
278272
INSTALL_DATA = @INSTALL_DATA@
279273
INSTALL_PROGRAM = @INSTALL_PROGRAM@
280274
INSTALL_SCRIPT = @INSTALL_SCRIPT@
281275
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
282-
LD = @LD@
283276
LDFLAGS = @LDFLAGS@
284277
LIBOBJS = @LIBOBJS@
285278
LIBS = @LIBS@
286-
LIBTOOL = @LIBTOOL@
287-
LIPO = @LIPO@
288-
LN_S = @LN_S@
289279
LTLIBOBJS = @LTLIBOBJS@
290280
MAINT = @MAINT@
291281
MAKEINFO = @MAKEINFO@
292-
MANIFEST_TOOL = @MANIFEST_TOOL@
293282
MKDIR_P = @MKDIR_P@
294-
NM = @NM@
295-
NMEDIT = @NMEDIT@
296-
OBJDUMP = @OBJDUMP@
297283
OBJEXT = @OBJEXT@
298-
OTOOL = @OTOOL@
299-
OTOOL64 = @OTOOL64@
300284
PACKAGE = @PACKAGE@
301285
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
302286
PACKAGE_NAME = @PACKAGE_NAME@
@@ -313,16 +297,13 @@ SHELL = @SHELL@
313297
STRIP = @STRIP@
314298
VERSION = @VERSION@
315299
WL_NOWHOLE = @WL_NOWHOLE@
316-
WL_RPATH = @WL_RPATH@
317300
WL_WHOLE = @WL_WHOLE@
318301
abs_builddir = @abs_builddir@
319302
abs_srcdir = @abs_srcdir@
320303
abs_top_builddir = @abs_top_builddir@
321304
abs_top_srcdir = @abs_top_srcdir@
322-
ac_ct_AR = @ac_ct_AR@
323305
ac_ct_CC = @ac_ct_CC@
324306
ac_ct_CXX = @ac_ct_CXX@
325-
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
326307
am__include = @am__include@
327308
am__leading_dot = @am__leading_dot@
328309
am__quote = @am__quote@
@@ -573,15 +554,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
573554
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
574555
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
575556
$(am__aclocal_m4_deps):
576-
577-
mostlyclean-libtool:
578-
-rm -f *.lo
579-
580-
clean-libtool:
581-
-rm -rf .libs _libs
582-
583-
distclean-libtool:
584-
-rm -f libtool config.lt
585557
install-enjuDATA: $(enju_DATA)
586558
@$(NORMAL_INSTALL)
587559
@list='$(enju_DATA)'; test -n "$(enjudir)" || list=; \
@@ -965,13 +937,12 @@ maintainer-clean-generic:
965937
@echo "it deletes files that may require special tools to rebuild."
966938
clean: clean-recursive
967939

968-
clean-am: clean-generic clean-libtool mostlyclean-am
940+
clean-am: clean-generic mostlyclean-am
969941

970942
distclean: distclean-recursive
971943
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
972944
-rm -f Makefile
973-
distclean-am: clean-am distclean-generic distclean-libtool \
974-
distclean-tags
945+
distclean-am: clean-am distclean-generic distclean-tags
975946

976947
dvi: dvi-recursive
977948

@@ -1019,7 +990,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
1019990

1020991
mostlyclean: mostlyclean-recursive
1021992

1022-
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
993+
mostlyclean-am: mostlyclean-generic
1023994

1024995
pdf: pdf-recursive
1025996

@@ -1035,10 +1006,9 @@ uninstall-am: uninstall-enjuDATA uninstall-nobase_enjuDATA
10351006

10361007
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
10371008
am--refresh check check-am clean clean-cscope clean-generic \
1038-
clean-libtool cscope cscopelist-am ctags ctags-am dist \
1039-
dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
1040-
dist-tarZ dist-xz dist-zip distcheck distclean \
1041-
distclean-generic distclean-libtool distclean-tags \
1009+
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
1010+
dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
1011+
dist-zip distcheck distclean distclean-generic distclean-tags \
10421012
distcleancheck distdir distuninstallcheck dvi dvi-am html \
10431013
html-am info info-am install install-am install-data \
10441014
install-data-am install-dvi install-dvi-am install-enjuDATA \
@@ -1047,9 +1017,9 @@ uninstall-am: uninstall-enjuDATA uninstall-nobase_enjuDATA
10471017
install-nobase_enjuDATA install-pdf install-pdf-am install-ps \
10481018
install-ps-am install-strip installcheck installcheck-am \
10491019
installdirs installdirs-am maintainer-clean \
1050-
maintainer-clean-generic mostlyclean mostlyclean-generic \
1051-
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
1052-
uninstall-am uninstall-enjuDATA uninstall-nobase_enjuDATA
1020+
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
1021+
pdf-am ps ps-am tags tags-am uninstall uninstall-am \
1022+
uninstall-enjuDATA uninstall-nobase_enjuDATA
10531023

10541024
.PRECIOUS: Makefile
10551025

0 commit comments

Comments
 (0)