--- psiconv/trunk/lib/psiconv/Makefile.in 2000/10/21 00:49:13 53 +++ psiconv/trunk/lib/psiconv/Makefile.in 2001/06/17 18:44:28 116 @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -38,7 +38,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +top_builddir = ../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -62,6 +62,8 @@ AS = @AS@ CC = @CC@ DLLTOOL = @DLLTOOL@ +ECHO = @ECHO@ +EXEEXT = @EXEEXT@ IMAGEMAGICK = @IMAGEMAGICK@ INT_16_BIT = @INT_16_BIT@ INT_32_BIT = @INT_32_BIT@ @@ -71,35 +73,41 @@ LN_S = @LN_S@ MAKEINFO = @MAKEINFO@ OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +STRIP = @STRIP@ VERSION = @VERSION@ cflags_set = @cflags_set@ -INCLUDES = -I.. -I../compat +INCLUDES = -I.. -I../../compat lib_LTLIBRARIES = libpsiconv.la -libpsiconv_la_SOURCES = checkuid.c data.c list.c parse_aux.c parse_common.c parse_driver.c parse_layout.c parse_image.c parse_page.c parse_simple.c parse_texted.c parse_word.c +libpsiconv_la_SOURCES = error.c misc.c checkuid.c list.c buffer.c data.c parse_common.c parse_driver.c parse_formula.c parse_layout.c parse_image.c parse_page.c parse_simple.c parse_texted.c parse_word.c parse_sheet.c generate_simple.c generate_layout.c generate_driver.c generate_common.c generate_texted.c generate_page.c generate_word.c generate_image.c -libpsiconv_la_LDFLAGS = -version-info 3:0:0 -libpsiconv_la_LIBADD = ../compat/libcompat.la +libpsiconv_la_LDFLAGS = -version-info 7:0:2 +libpsiconv_la_LIBADD = ../../compat/libcompat.la psiconvincludedir = $(includedir)/psiconv -psiconvinclude_HEADERS = data.h parse.h list.h parse_routines.h +psiconvinclude_HEADERS = data.h parse.h list.h parse_routines.h error.h generate_routines.h generate.h common.h buffer.h + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../config.h +CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = general.h LTLIBRARIES = $(lib_LTLIBRARIES) -DEFS = @DEFS@ -I. -I$(srcdir) -I.. +DEFS = @DEFS@ -I. -I$(srcdir) -I../.. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libpsiconv_la_DEPENDENCIES = ../compat/libcompat.la -libpsiconv_la_OBJECTS = checkuid.lo data.lo list.lo parse_aux.lo \ -parse_common.lo parse_driver.lo parse_layout.lo parse_image.lo \ -parse_page.lo parse_simple.lo parse_texted.lo parse_word.lo +libpsiconv_la_DEPENDENCIES = ../../compat/libcompat.la +libpsiconv_la_OBJECTS = error.lo misc.lo checkuid.lo list.lo buffer.lo \ +data.lo parse_common.lo parse_driver.lo parse_formula.lo \ +parse_layout.lo parse_image.lo parse_page.lo parse_simple.lo \ +parse_texted.lo parse_word.lo parse_sheet.lo generate_simple.lo \ +generate_layout.lo generate_driver.lo generate_common.lo \ +generate_texted.lo generate_page.lo generate_word.lo generate_image.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -114,18 +122,22 @@ TAR = tar GZIP_ENV = --best -DEP_FILES = .deps/checkuid.P .deps/data.P .deps/list.P \ -.deps/parse_aux.P .deps/parse_common.P .deps/parse_driver.P \ +DEP_FILES = .deps/buffer.P .deps/checkuid.P .deps/data.P .deps/error.P \ +.deps/generate_common.P .deps/generate_driver.P .deps/generate_image.P \ +.deps/generate_layout.P .deps/generate_page.P .deps/generate_simple.P \ +.deps/generate_texted.P .deps/generate_word.P .deps/list.P .deps/misc.P \ +.deps/parse_common.P .deps/parse_driver.P .deps/parse_formula.P \ .deps/parse_image.P .deps/parse_layout.P .deps/parse_page.P \ -.deps/parse_simple.P .deps/parse_texted.P .deps/parse_word.P +.deps/parse_sheet.P .deps/parse_simple.P .deps/parse_texted.P \ +.deps/parse_word.P SOURCES = $(libpsiconv_la_SOURCES) OBJECTS = $(libpsiconv_la_OBJECTS) all: all-redirect .SUFFIXES: -.SUFFIXES: .S .c .lo .o .s +.SUFFIXES: .S .c .lo .o .obj .s $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/psiconv/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ @@ -159,6 +171,11 @@ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + .s.o: $(COMPILE) -c $< @@ -167,6 +184,7 @@ mostlyclean-compile: -rm -f *.o core *.core + -rm -f *.$(OBJEXT) clean-compile: @@ -240,18 +258,18 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) -subdir = lib +subdir = lib/psiconv distdir: $(DISTFILES) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(top_distdir) && pwd`; \ distdir=`cd $(distdir) && pwd`; \ cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/Makefile + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/psiconv/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -301,7 +319,7 @@ install-exec-am: install-libLTLIBRARIES install-exec: install-exec-am -install-data-am: install-psiconvincludeHEADERS +install-data-am: install-psiconvincludeHEADERS install-data-local install-data: install-data-am install-am: all-am @@ -363,12 +381,20 @@ clean-tags maintainer-clean-tags distdir mostlyclean-depend \ distclean-depend clean-depend maintainer-clean-depend info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ +install-exec install-data-local install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +# There must be some automake-way to do this nicer, but for now it works. +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(psiconvincludedir) + p=general.h; \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(psiconvincludedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(psiconvincludedir)/$$p; + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: