Attachment #671638 for bug #754924

Lines 1-4 Link Here

(-)a/Makefile.am (-1 / +1 lines)
1	SUBDIRS = libaux plugin libreiser4 librepair libmisc progs include doc demos	1	SUBDIRS = libaux libmisc plugin libreiser4 librepair progs include doc demos
2		2
3	EXTRA_DIST = AUTHORS COPYING TODO NEWS BUGS README CREDITS THANKS \	3	EXTRA_DIST = AUTHORS COPYING TODO NEWS BUGS README CREDITS THANKS \
4	reiser4progs.spec.in reiser4progs.spec libreiser4.m4 \	4	reiser4progs.spec.in reiser4progs.spec libreiser4.m4 \

Lines 10-17 Link Here

(-)a/demos/Makefile.am (-2 / +2 lines)
10		10
11	busy_CFLAGS = @GENERIC_CFLAGS@	11	busy_CFLAGS = @GENERIC_CFLAGS@
12		12
13	busy_LDADD = $(top_builddir)/libreiser4/libreiser4.la \	13	busy_LDADD = $(top_builddir)/libmisc/libmisc.la \
14	$(top_builddir)/libmisc/libmisc.la \	14	$(top_builddir)/libreiser4/libreiser4.la \
15	$(PROGS_LIBS)	15	$(PROGS_LIBS)
16		16
17	EXTRA_DIST = $(noinst_SCRIPTS)	17	EXTRA_DIST = $(noinst_SCRIPTS)

Lines 1-4 Link Here

(-)a/libmisc/Makefile.am (-2 / +19 lines)
1	noinst_LTLIBRARIES = libmisc.la	1	miscincludedir = -I$(top_srcdir)/include
		2
		3	if ENABLE_MINIMAL
		4	MINIMAL_LIBS = libmisc-minimal.la
		5	else
		6	MINIMAL_LIBS =
		7	endif
		8
		9	noinst_LTLIBRARIES = libmisc.la $(MINIMAL_LIBS)
2		10
3	libmisc_la_SOURCES = misc.c profile.c exception.c gauge.c ui.c \	11	libmisc_la_SOURCES = misc.c profile.c exception.c gauge.c ui.c \
4	mpressure.c	12	mpressure.c
Lines 8-11 Link Here
8		16
9	libmisc_la_CFLAGS = @GENERIC_CFLAGS@	17	libmisc_la_CFLAGS = @GENERIC_CFLAGS@
10		18
11	AM_CPPFLAGS = -I$(top_srcdir)/include	19	if ENABLE_MINIMAL
		20	libmisc_minimal_la_SOURCES = $(libmisc_la_SOURCES)
		21
		22	libmisc_minimal_la_LIBADD = @AAL_LIBS@ $(UUID_LIBS) @PROGS_LIBS@ \
		23	$(top_builddir)/libaux/libaux-minimal.la
		24
		25	libmisc_minimal_la_CFLAGS = $(libmisc_la_CFLAGS)
		26	endif
		27
		28	AM_CPPFLAGS = $(miscincludedir)




lib_LTLIBRARIES		     = libreiser4.la $(MINIMAL_LIBS)
noinst_LTLIBRARIES	     = libreiser4-static.la

libreiser4_la_LIBADD	     = $(top_builddir)/libmisc/libmisc.la \
			       $(top_builddir)/plugin/libreiser4-plugin.la \
			       @AAL_LIBS@ 


			       -release $(LT_RELEASE)
libreiser4_la_CFLAGS         = @GENERIC_CFLAGS@

libreiser4_static_la_LIBADD  = $(top_builddir)/libmisc/libmisc.la \
			       $(top_builddir)/plugin/libreiser4-plugin.la \
			       @AAL_LIBS@ 


libreiser4_static_la_LDFLAGS = -static

if ENABLE_MINIMAL
libreiser4_minimal_la_LIBADD   = $(top_builddir)/libmisc/libmisc-minimal.la \
			       $(top_builddir)/plugin/libreiser4-plugin-minimal.la \
			       @AAL_MINIMAL_LIBS@ 


Lines 2-10 Link Here

(-)a/progs/debugfs/Makefile.am (-2 / +2 lines)
2	debugfs_reiser4_SOURCES = debugfs.c debugfs.h print.c print.h browse.c \	2	debugfs_reiser4_SOURCES = debugfs.c debugfs.h print.c print.h browse.c \
3	browse.h types.h	3	browse.h types.h
4		4
5	debugfs_reiser4_LDADD = $(top_builddir)/libreiser4/libreiser4.la \	5	debugfs_reiser4_LDADD = $(top_builddir)/libmisc/libmisc.la \
6	$(top_builddir)/librepair/librepair.la \	6	$(top_builddir)/librepair/librepair.la \
7	$(top_builddir)/libmisc/libmisc.la \	7	$(top_builddir)/libreiser4/libreiser4.la \
8	$(PROGS_LIBS)	8	$(PROGS_LIBS)
9		9
10	debugfs_reiser4_LDFLAGS = @PROGS_LDFLAGS@	10	debugfs_reiser4_LDFLAGS = @PROGS_LDFLAGS@

Lines 1-9 Link Here

(-)a/progs/fsck/Makefile.am (-2 / +2 lines)
1	sbin_PROGRAMS = fsck.reiser4	1	sbin_PROGRAMS = fsck.reiser4
2	fsck_reiser4_SOURCES = fsck.c backup.c fsck.h backup.h	2	fsck_reiser4_SOURCES = fsck.c backup.c fsck.h backup.h
3		3
4	fsck_reiser4_LDADD = $(top_builddir)/libreiser4/libreiser4.la \	4	fsck_reiser4_LDADD = $(top_builddir)/libmisc/libmisc.la \
5	$(top_builddir)/librepair/librepair.la \	5	$(top_builddir)/librepair/librepair.la \
6	$(top_builddir)/libmisc/libmisc.la \	6	$(top_builddir)/libreiser4/libreiser4.la \
7	@PROGS_LIBS@	7	@PROGS_LIBS@
8		8
9	fsck_reiser4_LDFLAGS = @PROGS_LDFLAGS@	9	fsck_reiser4_LDFLAGS = @PROGS_LDFLAGS@

Lines 1-8 Link Here

(-)a/progs/measurefs/Makefile.am (-2 / +2 lines)
1	sbin_PROGRAMS = measurefs.reiser4	1	sbin_PROGRAMS = measurefs.reiser4
2	measurefs_reiser4_SOURCES = measurefs.c	2	measurefs_reiser4_SOURCES = measurefs.c
3		3
4	measurefs_reiser4_LDADD = $(top_builddir)/libreiser4/libreiser4.la \	4	measurefs_reiser4_LDADD = $(top_builddir)/libmisc/libmisc.la \
5	$(top_builddir)/libmisc/libmisc.la \	5	$(top_builddir)/libreiser4/libreiser4.la \
6	$(PROGS_LIBS)	6	$(PROGS_LIBS)
7		7
8	measurefs_reiser4_LDFLAGS = @PROGS_LDFLAGS@	8	measurefs_reiser4_LDFLAGS = @PROGS_LDFLAGS@

Lines 1-8 Link Here

(-)a/progs/mkfs/Makefile.am (-2 / +2 lines)
1	sbin_PROGRAMS = mkfs.reiser4	1	sbin_PROGRAMS = mkfs.reiser4
2	mkfs_reiser4_SOURCES = mkfs.c	2	mkfs_reiser4_SOURCES = mkfs.c
3		3
4	mkfs_reiser4_LDADD = $(top_builddir)/libreiser4/libreiser4.la \	4	mkfs_reiser4_LDADD = $(top_builddir)/libmisc/libmisc.la \
5	$(top_builddir)/libmisc/libmisc.la \	5	$(top_builddir)/libreiser4/libreiser4.la \
6	$(PROGS_LIBS)	6	$(PROGS_LIBS)
7		7
8	mkfs_reiser4_LDFLAGS = @PROGS_LDFLAGS@	8	mkfs_reiser4_LDFLAGS = @PROGS_LDFLAGS@

Return to bug 754924

Lines 14-20 Link Here

(-)a/libreiser4/Makefile.am (-3 / +3 lines)
14	lib_LTLIBRARIES = libreiser4.la $(MINIMAL_LIBS)	14	lib_LTLIBRARIES = libreiser4.la $(MINIMAL_LIBS)
15	noinst_LTLIBRARIES = libreiser4-static.la	15	noinst_LTLIBRARIES = libreiser4-static.la
16		16
17	libreiser4_la_LIBADD = $(top_builddir)/libaux/libaux-static.la \	17	libreiser4_la_LIBADD = $(top_builddir)/libmisc/libmisc.la \
18	$(top_builddir)/plugin/libreiser4-plugin.la \	18	$(top_builddir)/plugin/libreiser4-plugin.la \
19	@AAL_LIBS@	19	@AAL_LIBS@
20		20
Lines 24-30 Link Here
24	-release $(LT_RELEASE)	24	-release $(LT_RELEASE)
25	libreiser4_la_CFLAGS = @GENERIC_CFLAGS@	25	libreiser4_la_CFLAGS = @GENERIC_CFLAGS@
26		26
27	libreiser4_static_la_LIBADD = $(top_builddir)/libaux/libaux-static.la \	27	libreiser4_static_la_LIBADD = $(top_builddir)/libmisc/libmisc.la \
28	$(top_builddir)/plugin/libreiser4-plugin.la \	28	$(top_builddir)/plugin/libreiser4-plugin.la \
29	@AAL_LIBS@	29	@AAL_LIBS@
30		30
Lines 33-39 Link Here
33	libreiser4_static_la_LDFLAGS = -static	33	libreiser4_static_la_LDFLAGS = -static
34		34
35	if ENABLE_MINIMAL	35	if ENABLE_MINIMAL
36	libreiser4_minimal_la_LIBADD = $(top_builddir)/libaux/libaux-minimal.la \	36	libreiser4_minimal_la_LIBADD = $(top_builddir)/libmisc/libmisc-minimal.la \
37	$(top_builddir)/plugin/libreiser4-plugin-minimal.la \	37	$(top_builddir)/plugin/libreiser4-plugin-minimal.la \
38	@AAL_MINIMAL_LIBS@	38	@AAL_MINIMAL_LIBS@
39		39