From b7d6baa368d731d09fa8f3b7651037b8ca1b1b04 Mon Sep 17 00:00:00 2001 From: orbea Date: Thu, 25 Mar 2021 08:20:26 -0700 Subject: [PATCH 1/2] build: Create libwml.la. Signed-off-by: orbea --- tools/wml/Makefile.am | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/wml/Makefile.am b/tools/wml/Makefile.am index 8ac04669..f99c8a71 100644 --- a/tools/wml/Makefile.am +++ b/tools/wml/Makefile.am @@ -27,15 +27,14 @@ wmluiltok_SOURCES = wmluiltok.l wmluiltok_LDADD = @LEXLIB@ wml_SOURCES = wml.c -wml_LDADD = -L. -lwml -wml_DEPENDENCIES = libwml.a +wml_LDADD = libwml.la wmldbcreate_LDADD = ../../lib/Xm/libXm.la INCLUDES = -I../../lib -I$(srcdir)/../../lib -I$(srcdir)/../../include ${X_CFLAGS} -noinst_LIBRARIES = libwml.a -libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c +noinst_LTLIBRARIES = libwml.la +libwml_la_SOURCES = wmlparse.y wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c wmlparse.c: wmllex.c @@ -66,7 +65,7 @@ motif.wmd: wmldbcreate ./wmldbcreate -o motif.wmd clean-local: - $(RM) $(WMLTARGETS) $(WMDTABLE) $(REPORT) lex.yy.c libwml.a wml \ + $(RM) $(WMLTARGETS) $(WMDTABLE) $(REPORT) lex.yy.c libwml.la wml \ *.mm *.sdml *.txt wmlparse.c wmlparse.h wmluiltok wmllex.c \ tokens.dat DONE wmluiltok.c Uil.c Uil.h wml.report UilLexPars.[ch] ylwrap -- 2.35.1 From 68aff6600854f5b7b6549e8ee9f9366424d062fe Mon Sep 17 00:00:00 2001 From: orbea Date: Thu, 25 Mar 2021 08:32:40 -0700 Subject: [PATCH 2/2] build: Create libXmd.la. Signed-off-by: orbea --- demos/doc/programGuide/ch05/Scale/Makefile.am | 2 +- demos/doc/programGuide/ch06/combo_box/Makefile.am | 2 +- demos/doc/programGuide/ch06/spin_box/Makefile.am | 2 +- demos/doc/programGuide/ch08/Container/Makefile.am | 2 +- demos/doc/programGuide/ch08/Notebook/Makefile.am | 2 +- demos/doc/programGuide/ch16/Makefile.am | 2 +- demos/doc/programGuide/ch17/simple_drag/Makefile.am | 2 +- demos/doc/programGuide/ch17/simple_drop/Makefile.am | 2 +- demos/lib/Xmd/Makefile.am | 6 +++--- demos/programs/animate/Makefile.am | 2 +- demos/programs/draw/Makefile.am | 2 +- demos/programs/filemanager/Makefile.am | 2 +- demos/programs/getsubres/Makefile.am | 2 +- demos/programs/i18ninput/Makefile.am | 2 +- demos/programs/sampler2_0/Makefile.am | 2 +- demos/programs/todo/Makefile.am | 2 +- demos/unsupported/aicon/Makefile.am | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/demos/doc/programGuide/ch05/Scale/Makefile.am b/demos/doc/programGuide/ch05/Scale/Makefile.am index 666240bc..03474cc7 100644 --- a/demos/doc/programGuide/ch05/Scale/Makefile.am +++ b/demos/doc/programGuide/ch05/Scale/Makefile.am @@ -8,4 +8,4 @@ tic_mark_SOURCES = tic_mark.c interface.c INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS) -LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la +LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la diff --git a/demos/doc/programGuide/ch06/combo_box/Makefile.am b/demos/doc/programGuide/ch06/combo_box/Makefile.am index 59a0b9e5..dcc8890f 100644 --- a/demos/doc/programGuide/ch06/combo_box/Makefile.am +++ b/demos/doc/programGuide/ch06/combo_box/Makefile.am @@ -9,4 +9,4 @@ combo_box_SOURCES = combo_box.c interface.c INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS) -LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la +LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la diff --git a/demos/doc/programGuide/ch06/spin_box/Makefile.am b/demos/doc/programGuide/ch06/spin_box/Makefile.am index 3f83854d..4d15b82a 100644 --- a/demos/doc/programGuide/ch06/spin_box/Makefile.am +++ b/demos/doc/programGuide/ch06/spin_box/Makefile.am @@ -9,4 +9,4 @@ spin_box_SOURCES = spin_box.c interface.c INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS) -LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la +LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la diff --git a/demos/doc/programGuide/ch08/Container/Makefile.am b/demos/doc/programGuide/ch08/Container/Makefile.am index 59ec0cbe..96970e38 100644 --- a/demos/doc/programGuide/ch08/Container/Makefile.am +++ b/demos/doc/programGuide/ch08/Container/Makefile.am @@ -8,4 +8,4 @@ container_SOURCES = container.c interface.c INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS) -LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la +LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la diff --git a/demos/doc/programGuide/ch08/Notebook/Makefile.am b/demos/doc/programGuide/ch08/Notebook/Makefile.am index 3daefe3e..633246d7 100644 --- a/demos/doc/programGuide/ch08/Notebook/Makefile.am +++ b/demos/doc/programGuide/ch08/Notebook/Makefile.am @@ -8,4 +8,4 @@ notebook_SOURCES = interface.c notebook.c INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS) -LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la +LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la diff --git a/demos/doc/programGuide/ch16/Makefile.am b/demos/doc/programGuide/ch16/Makefile.am index 24d900de..5be02d5f 100644 --- a/demos/doc/programGuide/ch16/Makefile.am +++ b/demos/doc/programGuide/ch16/Makefile.am @@ -9,4 +9,4 @@ UTMXmText_SOURCES = UTMXmText.c INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS) -LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la +LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la diff --git a/demos/doc/programGuide/ch17/simple_drag/Makefile.am b/demos/doc/programGuide/ch17/simple_drag/Makefile.am index 607827d4..49d9991c 100644 --- a/demos/doc/programGuide/ch17/simple_drag/Makefile.am +++ b/demos/doc/programGuide/ch17/simple_drag/Makefile.am @@ -9,4 +9,4 @@ simple_drag_SOURCES = simple_drag.c INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS) -LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la +LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la diff --git a/demos/doc/programGuide/ch17/simple_drop/Makefile.am b/demos/doc/programGuide/ch17/simple_drop/Makefile.am index 21905f1b..30d45673 100644 --- a/demos/doc/programGuide/ch17/simple_drop/Makefile.am +++ b/demos/doc/programGuide/ch17/simple_drop/Makefile.am @@ -9,4 +9,4 @@ simple_drop_SOURCES = simple_drop.c INCLUDES = -I$(top_builddir)/lib -I$(top_srcdir)/lib -I$(top_srcdir)/demos/lib $(X_CFLAGS) -LDADD = -L$(top_builddir)/demos/lib/Xmd -lXmd $(top_builddir)/lib/Xm/libXm.la +LDADD = $(top_builddir)/demos/lib/Xmd/libXmd.la $(top_builddir)/lib/Xm/libXm.la diff --git a/demos/lib/Xmd/Makefile.am b/demos/lib/Xmd/Makefile.am index 34f1aa82..2a432bbb 100644 --- a/demos/lib/Xmd/Makefile.am +++ b/demos/lib/Xmd/Makefile.am @@ -1,10 +1,10 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libXmd.a +noinst_LTLIBRARIES = libXmd.la noinst_PROGRAMS = onHelp -libXmd_a_SOURCES = Help.c Menus.c Print.c RegEdit.c AdjView.c +libXmd_la_SOURCES = Help.c Menus.c Print.c RegEdit.c AdjView.c noinst_HEADERS = AdjView.h \ Help.h HelpP.h \ @@ -12,7 +12,7 @@ Menus.h \ Print.h PrintP.h \ RegEdit.h RegEditI.h -LDADD = libXmd.a ../../../lib/Xm/libXm.la +LDADD = libXmd.la ../../../lib/Xm/libXm.la INCLUDES = -I$(top_builddir)/lib -I$(srcdir)/../../../lib ${X_CFLAGS} diff --git a/demos/programs/animate/Makefile.am b/demos/programs/animate/Makefile.am index 61d3dd12..5677bce7 100644 --- a/demos/programs/animate/Makefile.am +++ b/demos/programs/animate/Makefile.am @@ -17,7 +17,7 @@ data_DATA = dog.uid plane.uid superman.uid xmanimate.uid $(xmanimate_SOURCES) \ bin_PROGRAMS = xmanimate -LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Mrm/libMrm.la ../../../lib/Xm/libXm.la +LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Mrm/libMrm.la ../../../lib/Xm/libXm.la INCLUDES = -I$(srcdir)/../../../lib \ -I$(srcdir)/../../lib \ diff --git a/demos/programs/draw/Makefile.am b/demos/programs/draw/Makefile.am index 69388278..8a7ba950 100644 --- a/demos/programs/draw/Makefile.am +++ b/demos/programs/draw/Makefile.am @@ -7,5 +7,5 @@ bin_PROGRAMS = draw draw_SOURCES = draw.c EXTRA_DIST = XmdDraw.ad README draw.help draw.man data_DATA = $(EXTRA_DIST) $(draw_SOURCES) -LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la +LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} diff --git a/demos/programs/filemanager/Makefile.am b/demos/programs/filemanager/Makefile.am index cd71be28..26415896 100644 --- a/demos/programs/filemanager/Makefile.am +++ b/demos/programs/filemanager/Makefile.am @@ -11,7 +11,7 @@ EXTRA_DIST = filemanager.man filemanager.help XmdFilemanager.ad \ obj.xpm pix.xpm s_dir.xpm s_exec.xpm s_file.xpm \ s_none.xpm s_pix.xpm data_DATA = $(EXTRA_DIST) $(filemanager_SOURCES) -LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la +LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} diff --git a/demos/programs/getsubres/Makefile.am b/demos/programs/getsubres/Makefile.am index c61a46e3..50e093ca 100644 --- a/demos/programs/getsubres/Makefile.am +++ b/demos/programs/getsubres/Makefile.am @@ -7,5 +7,5 @@ bin_PROGRAMS = getsubres EXTRA_DIST = getsubres.help getsubres.man README getsubres_SOURCES = getsubres.c data_DATA = $(EXTRA_DIST) $(getsubres_SOURCES) -LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la +LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} diff --git a/demos/programs/i18ninput/Makefile.am b/demos/programs/i18ninput/Makefile.am index 3751fcef..3124fd23 100644 --- a/demos/programs/i18ninput/Makefile.am +++ b/demos/programs/i18ninput/Makefile.am @@ -7,6 +7,6 @@ bin_PROGRAMS = i18ninput i18ninput_SOURCES = i18ninput.c input.c EXTRA_DIST = XmdI18nInput.ad README i18ninput.man i18ninput.help data_DATA = $(EXTRA_DIST) $(i18ninput_SOURCES) -LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la +LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} diff --git a/demos/programs/sampler2_0/Makefile.am b/demos/programs/sampler2_0/Makefile.am index bfb22862..950a6cc5 100644 --- a/demos/programs/sampler2_0/Makefile.am +++ b/demos/programs/sampler2_0/Makefile.am @@ -10,6 +10,6 @@ EXTRA_DIST = bee.xpm bomb.xpm cherry.xpm da.xpm girlface.xpm k7.xpm \ bin_PROGRAMS = sampler2_0 sampler2_0_SOURCES = sampler2_0.c data_DATA = $(sampler2_0_SOURCES) $(EXTRA_DIST) -LDADD = ../../lib/Xmd/libXmd.a ../../../lib/Xm/libXm.la +LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../../lib -I$(top_builddir)/lib ${X_CFLAGS} diff --git a/demos/programs/todo/Makefile.am b/demos/programs/todo/Makefile.am index 138662e3..afc311af 100644 --- a/demos/programs/todo/Makefile.am +++ b/demos/programs/todo/Makefile.am @@ -9,4 +9,4 @@ todo_SOURCES = todo.c io.c actions.c page.h data_DATA = $(EXTRA_DIST) $(todo_SOURCES) INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib -I$(top_builddir)/lib ${X_CFLAGS} -LDADD = -L../../lib/Xmd -lXmd -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la +LDADD = ../../lib/Xmd/libXmd.la -L../../lib/Exm -lExm ../../../lib/Xm/libXm.la diff --git a/demos/unsupported/aicon/Makefile.am b/demos/unsupported/aicon/Makefile.am index 6b351ade..2985dd3f 100644 --- a/demos/unsupported/aicon/Makefile.am +++ b/demos/unsupported/aicon/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_PROGRAMS = aicon -LDADD = -L../../lib/Xmd -lXmd ../../../lib/Xm/libXm.la +LDADD = ../../lib/Xmd/libXmd.la ../../../lib/Xm/libXm.la INCLUDES = -I$(srcdir)/../../../lib -I$(srcdir)/../../lib -I$(top_builddir)/lib ${X_CFLAGS} -- 2.35.1