--- psiconv/trunk/lib/psiconv/Makefile.in 2000/12/10 16:13:24 57 +++ psiconv/trunk/lib/psiconv/Makefile.in 2000/12/23 20:21:40 72 @@ -38,7 +38,7 @@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. +top_builddir = ../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -76,30 +76,31 @@ 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 = checkuid.c data.c error.c misc.c list.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 generate_simple.c generate_layout.c -libpsiconv_la_LDFLAGS = -version-info 4:0:0 -libpsiconv_la_LIBADD = ../compat/libcompat.la +libpsiconv_la_LDFLAGS = -version-info 4:1:0 +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 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 \ +libpsiconv_la_DEPENDENCIES = ../../compat/libcompat.la +libpsiconv_la_OBJECTS = checkuid.lo data.lo error.lo misc.lo list.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 +parse_page.lo parse_simple.lo parse_texted.lo parse_word.lo \ +generate_simple.lo generate_layout.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,8 +115,9 @@ 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/checkuid.P .deps/data.P .deps/error.P \ +.deps/generate_layout.P .deps/generate_simple.P .deps/list.P \ +.deps/misc.P .deps/parse_common.P .deps/parse_driver.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 SOURCES = $(libpsiconv_la_SOURCES) @@ -125,7 +127,7 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .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) \ @@ -240,14 +242,14 @@ 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 \