Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 778050 | Differences between
and this patch

Collapse All | Expand All

(-)a/tools/wml/Makefile.am (-7 / +4 lines)
Lines 27-41 wmluiltok_SOURCES = wmluiltok.l Link Here
27
wmluiltok_LDADD = @LEXLIB@
27
wmluiltok_LDADD = @LEXLIB@
28
28
29
wml_SOURCES = wml.c
29
wml_SOURCES = wml.c
30
wml_LDADD = -L. -lwml
30
wml_LDADD = libwml.la
31
wml_DEPENDENCIES = libwml.a
32
31
33
wmldbcreate_LDADD = ../../lib/Xm/libXm.la
32
wmldbcreate_LDADD = ../../lib/Xm/libXm.la
34
33
35
INCLUDES = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include ${X_CFLAGS} 
34
INCLUDES = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include ${X_CFLAGS} 
36
35
37
noinst_LIBRARIES = libwml.a
36
noinst_LTLIBRARIES = libwml.la
38
libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c
37
libwml_la_SOURCES = wmlparse.y wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c
39
38
40
wmlparse.c: wmllex.c
39
wmlparse.c: wmllex.c
41
40
Lines 66-72 motif.wmd: wmldbcreate Link Here
66
	./wmldbcreate -o motif.wmd
65
	./wmldbcreate -o motif.wmd
67
66
68
clean-local:
67
clean-local:
69
	$(RM) $(WMLTARGETS) $(WMDTABLE) $(REPORT) lex.yy.c libwml.a wml \
68
	$(RM) $(WMLTARGETS) $(WMDTABLE) $(REPORT) lex.yy.c libwml.la wml \
70
	*.mm *.sdml *.txt wmlparse.c wmlparse.h wmluiltok wmllex.c \
69
	*.mm *.sdml *.txt wmlparse.c wmlparse.h wmluiltok wmllex.c \
71
	tokens.dat DONE wmluiltok.c Uil.c Uil.h wml.report UilLexPars.[ch] ylwrap
70
	tokens.dat DONE wmluiltok.c Uil.c Uil.h wml.report UilLexPars.[ch] ylwrap
72
 
71
 
73
- 
74
--
75
demos/doc/programGuide/ch05/Scale/Makefile.am       | 2 +-
72
demos/doc/programGuide/ch05/Scale/Makefile.am       | 2 +-
76
demos/doc/programGuide/ch06/combo_box/Makefile.am   | 2 +-
73
demos/doc/programGuide/ch06/combo_box/Makefile.am   | 2 +-
77
demos/doc/programGuide/ch06/spin_box/Makefile.am    | 2 +-
74
demos/doc/programGuide/ch06/spin_box/Makefile.am    | 2 +-
78
demos/doc/programGuide/ch08/Container/Makefile.am   | 2 +-
75
demos/doc/programGuide/ch08/Container/Makefile.am   | 2 +-
79
demos/doc/programGuide/ch08/Notebook/Makefile.am    | 2 +-
76
demos/doc/programGuide/ch08/Notebook/Makefile.am    | 2 +-
80
demos/doc/programGuide/ch16/Makefile.am             | 2 +-
77
demos/doc/programGuide/ch16/Makefile.am             | 2 +-
81
demos/doc/programGuide/ch17/simple_drag/Makefile.am | 2 +-
78
demos/doc/programGuide/ch17/simple_drag/Makefile.am | 2 +-
82
demos/doc/programGuide/ch17/simple_drop/Makefile.am | 2 +-
79
demos/doc/programGuide/ch17/simple_drop/Makefile.am | 2 +-
83
demos/lib/Xmd/Makefile.am                           | 6 +++---
80
demos/lib/Xmd/Makefile.am                           | 6 +++---
84
demos/programs/animate/Makefile.am                  | 2 +-
81
demos/programs/animate/Makefile.am                  | 2 +-
85
demos/programs/draw/Makefile.am                     | 2 +-
82
demos/programs/draw/Makefile.am                     | 2 +-
86
demos/programs/filemanager/Makefile.am              | 2 +-
83
demos/programs/filemanager/Makefile.am              | 2 +-
87
demos/programs/getsubres/Makefile.am                | 2 +-
84
demos/programs/getsubres/Makefile.am                | 2 +-
88
demos/programs/i18ninput/Makefile.am                | 2 +-
85
demos/programs/i18ninput/Makefile.am                | 2 +-
89
demos/programs/sampler2_0/Makefile.am               | 2 +-
86
demos/programs/sampler2_0/Makefile.am               | 2 +-
90
demos/programs/todo/Makefile.am                     | 2 +-
87
demos/programs/todo/Makefile.am                     | 2 +-
91
demos/unsupported/aicon/Makefile.am                 | 2 +-
88
demos/unsupported/aicon/Makefile.am                 | 2 +-
92
17 files changed, 19 insertions(+), 19 deletions(-)
89
17 files changed, 19 insertions(+), 19 deletions(-)
(-)a/demos/doc/programGuide/ch05/Scale/Makefile.am (-1 / +1 lines)
Lines 8-11 tic_mark_SOURCES = tic_mark.c interface.c Link Here
8
8
9
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
9
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
10
10
11
LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la
11
LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la
(-)a/demos/doc/programGuide/ch06/combo_box/Makefile.am (-1 / +1 lines)
Lines 9-12 combo_box_SOURCES = combo_box.c interface.c Link Here
9
9
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
11
11
12
LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la
12
LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la
(-)a/demos/doc/programGuide/ch06/spin_box/Makefile.am (-1 / +1 lines)
Lines 9-12 spin_box_SOURCES = spin_box.c interface.c Link Here
9
9
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
11
11
12
LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la
12
LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la
(-)a/demos/doc/programGuide/ch08/Container/Makefile.am (-1 / +1 lines)
Lines 8-11 container_SOURCES = container.c interface.c Link Here
8
8
9
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
9
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
10
10
11
LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la
11
LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la
(-)a/demos/doc/programGuide/ch08/Notebook/Makefile.am (-1 / +1 lines)
Lines 8-11 notebook_SOURCES = interface.c notebook.c Link Here
8
8
9
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
9
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
10
10
11
LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la
11
LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la
(-)a/demos/doc/programGuide/ch16/Makefile.am (-1 / +1 lines)
Lines 9-12 UTMXmText_SOURCES = UTMXmText.c Link Here
9
9
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
11
11
12
LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la
12
LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la
(-)a/demos/doc/programGuide/ch17/simple_drag/Makefile.am (-1 / +1 lines)
Lines 9-12 simple_drag_SOURCES = simple_drag.c Link Here
9
9
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
11
11
12
LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la
12
LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la
(-)a/demos/doc/programGuide/ch17/simple_drop/Makefile.am (-1 / +1 lines)
Lines 9-12 simple_drop_SOURCES = simple_drop.c Link Here
9
9
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
10
INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS)
11
11
12
LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la
12
LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la
(-)a/demos/lib/Xmd/Makefile.am (-3 / +3 lines)
Lines 1-10 Link Here
1
MAINTAINERCLEANFILES = Makefile.in
1
MAINTAINERCLEANFILES = Makefile.in
2
2
3
noinst_LIBRARIES = libXmd.a
3
noinst_LTLIBRARIES = libXmd.la
4
4
5
noinst_PROGRAMS = onHelp
5
noinst_PROGRAMS = onHelp
6
6
7
libXmd_a_SOURCES = Help.c Menus.c Print.c RegEdit.c AdjView.c
7
libXmd_la_SOURCES = Help.c Menus.c Print.c RegEdit.c AdjView.c
8
8
9
noinst_HEADERS = AdjView.h \
9
noinst_HEADERS = AdjView.h \
10
Help.h HelpP.h \
10
Help.h HelpP.h \
Lines 12-18 Menus.h \ Link Here
12
Print.h PrintP.h \
12
Print.h PrintP.h \
13
RegEdit.h RegEditI.h
13
RegEdit.h RegEditI.h
14
14
15
LDADD = libXmd.a ../../../lib/Xm/libXm.la
15
LDADD = libXmd.la ../../../lib/Xm/libXm.la
16
16
17
INCLUDES = -I$(top_builddir)/lib -I$(srcdir)/../../../lib ${X_CFLAGS} 
17
INCLUDES = -I$(top_builddir)/lib -I$(srcdir)/../../../lib ${X_CFLAGS} 
18
18
(-)a/demos/programs/animate/Makefile.am (-1 / +1 lines)
Lines 17-23 data_DATA = dog.uid plane.uid superman.uid xmanimate.uid $(xmanimate_SOURCES) \ Link Here
17
17
18
bin_PROGRAMS = xmanimate
18
bin_PROGRAMS = xmanimate
19
19
20
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Mrm/libMrm.la ../../../lib/Xm/libXm.la
20
LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Mrm/libMrm.la ../../../lib/Xm/libXm.la
21
21
22
INCLUDES = -I$(srcdir)/../../../lib \
22
INCLUDES = -I$(srcdir)/../../../lib \
23
           -I$(srcdir)/../../lib \
23
           -I$(srcdir)/../../lib \
(-)a/demos/programs/draw/Makefile.am (-1 / +1 lines)
Lines 7-11 bin_PROGRAMS = draw Link Here
7
draw_SOURCES = draw.c
7
draw_SOURCES = draw.c
8
EXTRA_DIST = XmdDraw.ad README draw.help draw.man
8
EXTRA_DIST = XmdDraw.ad README draw.help draw.man
9
data_DATA = $(EXTRA_DIST) $(draw_SOURCES)
9
data_DATA = $(EXTRA_DIST) $(draw_SOURCES)
10
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
10
LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la
11
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
11
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
(-)a/demos/programs/filemanager/Makefile.am (-1 / +1 lines)
Lines 11-17 EXTRA_DIST = filemanager.man filemanager.help XmdFilemanager.ad \ Link Here
11
           obj.xpm pix.xpm s_dir.xpm s_exec.xpm s_file.xpm \
11
           obj.xpm pix.xpm s_dir.xpm s_exec.xpm s_file.xpm \
12
           s_none.xpm s_pix.xpm
12
           s_none.xpm s_pix.xpm
13
data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES)
13
data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES)
14
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
14
LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la
15
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
15
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
16
16
17
17
(-)a/demos/programs/getsubres/Makefile.am (-1 / +1 lines)
Lines 7-11 bin_PROGRAMS = getsubres Link Here
7
EXTRA_DIST = getsubres.help getsubres.man README
7
EXTRA_DIST = getsubres.help getsubres.man README
8
getsubres_SOURCES = getsubres.c
8
getsubres_SOURCES = getsubres.c
9
data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES)
9
data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES)
10
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
10
LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la
11
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
11
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
(-)a/demos/programs/i18ninput/Makefile.am (-1 / +1 lines)
Lines 7-12 bin_PROGRAMS = i18ninput Link Here
7
i18ninput_SOURCES = i18ninput.c input.c 
7
i18ninput_SOURCES = i18ninput.c input.c 
8
EXTRA_DIST = XmdI18nInput.ad README i18ninput.man i18ninput.help
8
EXTRA_DIST = XmdI18nInput.ad README i18ninput.man i18ninput.help
9
data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES)
9
data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES)
10
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
10
LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la
11
11
12
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
12
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
(-)a/demos/programs/sampler2_0/Makefile.am (-1 / +1 lines)
Lines 10-15 EXTRA_DIST = bee.xpm bomb.xpm cherry.xpm da.xpm girlface.xpm k7.xpm \ Link Here
10
bin_PROGRAMS = sampler2_0
10
bin_PROGRAMS = sampler2_0
11
sampler2_0_SOURCES = sampler2_0.c
11
sampler2_0_SOURCES = sampler2_0.c
12
data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST)
12
data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST)
13
LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la
13
LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la
14
14
15
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
15
INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
(-)a/demos/programs/todo/Makefile.am (-1 / +1 lines)
Lines 9-12 todo_SOURCES = todo.c io.c actions.c page.h Link Here
9
data_DATA = $(EXTRA_DIST) $(todo_SOURCES)
9
data_DATA = $(EXTRA_DIST) $(todo_SOURCES)
10
10
11
INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
11
INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
12
LDADD = -L../../lib/Xmd -lXmd -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la 
12
LDADD = ../../lib/Xmd/libXmd.la -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la
(-)a/demos/unsupported/aicon/Makefile.am (-2 / +1 lines)
Lines 2-8 MAINTAINERCLEANFILES = Makefile.in Link Here
2
2
3
noinst_PROGRAMS = aicon
3
noinst_PROGRAMS = aicon
4
 
4
 
5
LDADD = -L../../lib/Xmd -lXmd ../../../lib/Xm/libXm.la 
5
LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la
6
6
7
INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
7
INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib -I$(top_builddir)/lib ${X_CFLAGS} 
8
8
9
- 

Return to bug 778050