Attachment #696279 for bug #778581

Lines 1-6 Link Here

(-)a/configure.ac (-1 / +2 lines)
1	dnl Process this file with autoconf to produce a configure script.	1	dnl Process this file with autoconf to produce a configure script.
2	AC_INIT([Lpe], [1.2.8])	2	AC_INIT([Lpe], [1.2.8])
3	AC_CONFIG_SRCDIR([src/lpe.c])	3	AC_CONFIG_SRCDIR([src/utils/lpe.c])
4	AM_CONFIG_HEADER(config.h)	4	AM_CONFIG_HEADER(config.h)
5	AC_CONFIG_MACRO_DIR([m4])	5	AC_CONFIG_MACRO_DIR([m4])
6	AM_INIT_AUTOMAKE	6	AM_INIT_AUTOMAKE
Lines 162-165 data/Makefile Link Here
162	man/Makefile	162	man/Makefile
163	po/Makefile.in	163	po/Makefile.in
164	src/Makefile	164	src/Makefile
		165	src/utils/Makefile
165	src/modes/Makefile])	166	src/modes/Makefile])




MAINTAINERCLEANFILES = Makefile.in

AM_CPPFLAGS = -DPLUGINDIR=\"$(libdir)/lpe\" -I$(top_srcdir)/src/utils

SUBDIRS = utils modes

bin_PROGRAMS = lpe

lpe_SOURCES = \
	buffer.c buffer.h \
	cfg-core.c cfg-core.h \
	cfg.c cfg.h \
	exports.c exports.h \
	genmode.c genmode.h \
	help.c help.h \
	highlight.h \
	i18n.h \
	options.h
	lpe.c lpe.h \
	lpecomm.c lpecomm.h \
	minibuf.c minibuf.h \
	mode-utils.c mode-utils.h \
	options.h \
	screen.c screen.h \
	strfuncs.c strfuncs.h \
	common.c common.h

AM_CFLAGS = -DDATADIR=\"$(datadir)/lpe\"

lpe_LDADD = $(top_srcdir)/src/utils/liblpe_utils.la
lpe_LDFLAGS = @lpe_LDFLAGS@
lpe_DEPENDENCIES = @lpe_DEPS@ @INTLOBJS@

if USE_INCLUDED_LIBINTL
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/lpe" -I$(top_srcdir)/intl
else
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
endif

AM_CPPFLAGS += -DPLUGINDIR=\"$(libdir)/lpe\"

EXTRA_DIST = templ.c templ.h




MAINTAINERCLEANFILES = Makefile.in

AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/utils
AM_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)

liblpedir = $(libdir)/lpe


	mailmode.la javamode.la lispmode.la

cmode_la_SOURCES = cmode.c
cmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
cppmode_la_SOURCES = cppmode.c
cppmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
perlmode_la_SOURCES = perlmode.c
perlmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
htmlmode_la_SOURCES = htmlmode.c
htmlmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
sgmlmode_la_SOURCES = sgmlmode.c
sgmlmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
mailmode_la_SOURCES = mailmode.c
mailmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
javamode_la_SOURCES = javamode.c
javamode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
lispmode_la_SOURCES = lispmode.c
lispmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la




MAINTAINERCLEANFILES = Makefile.in

if USE_INCLUDED_LIBINTL
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/lpe" -I$(top_srcdir)/intl
else
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
endif

AM_CPPFLAGS += -DDATADIR=\"$(datadir)/lpe\" -DPLUGINDIR=\"$(libdir)/lpe\" \
	-I$(top_srcdir)/src

noinst_LTLIBRARIES = liblpe_utils.la

liblpe_utils_la_SOURCES = \
	buffer.c buffer.h \
	cfg-core.c cfg-core.h \
	cfg.c cfg.h \
	common.c common.h \
	exports.c exports.h \
	genmode.c genmode.h \
	help.c help.h \
	input.c input.h \
	lpecomm.c lpecomm.h \
	lpe.c lpe.h \
	minibuf.c minibuf.h \
	mode-utils.c mode-utils.h \
	strfuncs.c strfuncs.h \
	screen.c screen.h

liblpe_utils_la_LIBADD = @LIBINTL@ @INTLOBJS@ @DL_LIB@ @SLANG_LIB@ -lncurses -ltinfo
liblpe_utils_la_LDFLAGS = @lpe_LDFLAGS@ -no-undefined
liblpe_utils_la_DEPENDENCIES = @lpe_DEPS@ @INTLOBJS@

Return to bug 778581

Lines 1-40 Link Here

(-)a/src/Makefile.am (-28 / +5 lines)
1	MAINTAINERCLEANFILES = Makefile.in	1	MAINTAINERCLEANFILES = Makefile.in
2		2
3	SUBDIRS = modes	3	AM_CPPFLAGS = -DPLUGINDIR=\"$(libdir)/lpe\" -I$(top_srcdir)/src/utils
		4
		5	SUBDIRS = utils modes
4		6
5	bin_PROGRAMS = lpe	7	bin_PROGRAMS = lpe
6		8
7	lpe_SOURCES = \	9	lpe_SOURCES = \
8	buffer.c buffer.h \
9	cfg-core.c cfg-core.h \
10	cfg.c cfg.h \
11	exports.c exports.h \
12	genmode.c genmode.h \
13	help.c help.h \
14	highlight.h \	10	highlight.h \
15	i18n.h \	11	i18n.h \
16	input.c input.h \	12	options.h
17	lpe.c lpe.h \
18	lpecomm.c lpecomm.h \
19	minibuf.c minibuf.h \
20	mode-utils.c mode-utils.h \
21	options.h \
22	screen.c screen.h \
23	strfuncs.c strfuncs.h \
24	common.c common.h
25
26	AM_CFLAGS = -DDATADIR=\"$(datadir)/lpe\"
27		13
28	lpe_LDADD = @LIBINTL@ @INTLOBJS@ @DL_LIB@ @SLANG_LIB@ -lncurses	14	lpe_LDADD = $(top_srcdir)/src/utils/liblpe_utils.la
29	lpe_LDFLAGS = @lpe_LDFLAGS@	15	lpe_LDFLAGS = @lpe_LDFLAGS@
30	lpe_DEPENDENCIES = @lpe_DEPS@ @INTLOBJS@
31
32	if USE_INCLUDED_LIBINTL
33	AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/lpe" -I$(top_srcdir)/intl
34	else
35	AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
36	endif
37
38	AM_CPPFLAGS += -DPLUGINDIR=\"$(libdir)/lpe\"
39		16
40	EXTRA_DIST = templ.c templ.h	17	EXTRA_DIST = templ.c templ.h

Lines 1-6 Link Here

(-)a/src/modes/Makefile.am (-9 / +10 lines)
1	MAINTAINERCLEANFILES = Makefile.in	1	MAINTAINERCLEANFILES = Makefile.in
2		2
3	AM_CFLAGS = -I$(top_srcdir)/src	3	AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/utils
		4	AM_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)
4		5
5	liblpedir = $(libdir)/lpe	6	liblpedir = $(libdir)/lpe
6		7
Lines 11-28 EXTRA_LTLIBRARIES = \ Link Here
11	mailmode.la javamode.la lispmode.la	12	mailmode.la javamode.la lispmode.la
12		13
13	cmode_la_SOURCES = cmode.c	14	cmode_la_SOURCES = cmode.c
14	cmode_la_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)	15	cmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
15	cppmode_la_SOURCES = cppmode.c	16	cppmode_la_SOURCES = cppmode.c
16	cppmode_la_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)	17	cppmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
17	perlmode_la_SOURCES = perlmode.c	18	perlmode_la_SOURCES = perlmode.c
18	perlmode_la_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)	19	perlmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
19	htmlmode_la_SOURCES = htmlmode.c	20	htmlmode_la_SOURCES = htmlmode.c
20	htmlmode_la_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)	21	htmlmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
21	sgmlmode_la_SOURCES = sgmlmode.c	22	sgmlmode_la_SOURCES = sgmlmode.c
22	sgmlmode_la_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)	23	sgmlmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
23	mailmode_la_SOURCES = mailmode.c	24	mailmode_la_SOURCES = mailmode.c
24	mailmode_la_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)	25	mailmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
25	javamode_la_SOURCES = javamode.c	26	javamode_la_SOURCES = javamode.c
26	javamode_la_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)	27	javamode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la
27	lispmode_la_SOURCES = lispmode.c	28	lispmode_la_SOURCES = lispmode.c
28	lispmode_la_LDFLAGS = -no-undefined -avoid-version -module -export-dynamic -rpath $(liblpedir)	29	lispmode_la_LIBADD = $(top_srcdir)/src/utils/liblpe_utils.la

Line 0 Link Here

(-)a/src/utils/Makefile.am (+32 lines)
	1	MAINTAINERCLEANFILES = Makefile.in
	2
	3	if USE_INCLUDED_LIBINTL
	4	AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/lpe" -I$(top_srcdir)/intl
	5	else
	6	AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
	7	endif
	8
	9	AM_CPPFLAGS += -DDATADIR=\"$(datadir)/lpe\" -DPLUGINDIR=\"$(libdir)/lpe\" \
	10	-I$(top_srcdir)/src
	11
	12	noinst_LTLIBRARIES = liblpe_utils.la
	13
	14	liblpe_utils_la_SOURCES = \
	15	buffer.c buffer.h \
	16	cfg-core.c cfg-core.h \
	17	cfg.c cfg.h \
	18	common.c common.h \
	19	exports.c exports.h \
	20	genmode.c genmode.h \
	21	help.c help.h \
	22	input.c input.h \
	23	lpecomm.c lpecomm.h \
	24	lpe.c lpe.h \
	25	minibuf.c minibuf.h \
	26	mode-utils.c mode-utils.h \
	27	strfuncs.c strfuncs.h \
	28	screen.c screen.h
	29
	30	liblpe_utils_la_LIBADD = @LIBINTL@ @INTLOBJS@ @DL_LIB@ @SLANG_LIB@ -lncurses -ltinfo
	31	liblpe_utils_la_LDFLAGS = @lpe_LDFLAGS@ -no-undefined
	32	liblpe_utils_la_DEPENDENCIES = @lpe_DEPS@ @INTLOBJS@