diff options
| -rw-r--r-- | .cvsignore | 22 | ||||
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | include/.cvsignore | 2 | ||||
| -rw-r--r-- | man/.cvsignore | 2 | ||||
| -rw-r--r-- | src/.cvsignore | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 111 |
8 files changed, 178 insertions, 4 deletions
diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..5bcb177 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,22 @@ +aclocal.m4 +autom4te.cache +compile +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +Makefile +Makefile.in +missing +mkinstalldirs +stamp-h1 +xaw6.pc +xaw7.pc +xaw8.pc @@ -1,3 +1,19 @@ +2005-07-08 Keith Packard <keithp@keithp.com> + + * .cvsignore: + * include/.cvsignore: + * man/.cvsignore: + * src/.cvsignore: + Add .cvsignore files + + * Makefile.am: + * configure.ac: + * src/Makefile.am: + Build all three versions in src. Hack libtool to set SONAME in the + libtool output to match old libXaw file names. Still missing is the + creation of appropriate symlinks from libXaw.so.6 -> libXaw6.so.6 et + al so that libraries not yet installed will work properly. + 2005-01-22 Daniel Stone <daniel@freedesktop.org> * configure.ac: diff --git a/Makefile.am b/Makefile.am index e0fc4c1..242636c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = include Xaw6 Xaw7 Xaw8 man +SUBDIRS = include src man aclocaldir = $(datadir)/aclocal aclocal_DATA = xaw.m4 diff --git a/configure.ac b/configure.ac index 37fb4e4..449937b 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,23 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_LIBTOOL +# +# fix libtool to set SONAME to libXaw.so.$major +# +AC_MSG_CHECKING([hacks in libtool for libXaw SONAME]) +if grep -q "soname_spec='libXaw" libtool; then + AC_MSG_RESULT([already done]) +else + ed libtool << \EOF +/^soname_spec/a +# x.org hack to match monolithic Xaw SONAME +soname_spec='libXaw\${shared_ext}\$major' +. +w +q +EOF + AC_MSG_RESULT([fixed]) +fi # Whether to build Xaw6 @@ -76,9 +93,7 @@ AC_HEADER_STDC AC_OUTPUT([Makefile include/Makefile man/Makefile - Xaw6/Makefile - Xaw7/Makefile - Xaw8/Makefile]) + src/Makefile]) if test "x$build_v6" = xyes; then AC_OUTPUT(xaw6.pc) diff --git a/include/.cvsignore b/include/.cvsignore new file mode 100644 index 0000000..282522d --- /dev/null +++ b/include/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/man/.cvsignore b/man/.cvsignore new file mode 100644 index 0000000..282522d --- /dev/null +++ b/man/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/src/.cvsignore b/src/.cvsignore new file mode 100644 index 0000000..62535c7 --- /dev/null +++ b/src/.cvsignore @@ -0,0 +1,6 @@ +.deps +.libs +*.la +*.lo +Makefile +Makefile.in diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..6bb1b52 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,111 @@ +lib_LTLIBRARIES = + +# +# This doesn't appear to be used on any +# current systems -- it requires SUNSHLIB and !SHAREDCODE, +# but only sunLib.rules defines SUNSHLIB and that file also +# always defines SHAREDCODE. Go figure +# +# SHAREDLIB_SOURCES = sharedlib.c + +COMMON_SOURCES = \ + Actions.c \ + AllWidgets.c \ + AsciiSink.c \ + AsciiSrc.c \ + AsciiText.c \ + Box.c \ + Command.c \ + Converters.c \ + Dialog.c \ + DisplayList.c \ + Form.c \ + Grip.c \ + Label.c \ + List.c \ + MenuButton.c \ + MultiSrc.c \ + MultiSink.c \ + OS.c \ + Paned.c \ + Panner.c \ + Pixmap.c \ + Porthole.c \ + Private.h \ + Repeater.c \ + Scrollbar.c \ + Simple.c \ + SimpleMenu.c \ + Sme.c \ + SmeBSB.c \ + SmeLine.c \ + StripChart.c \ + Text.c \ + TextSink.c \ + TextSrc.c \ + TextAction.c \ + TextPop.c \ + TextTr.c \ + Toggle.c \ + Tree.c \ + Vendor.c \ + Viewport.c \ + XawIm.c \ + XawInit.c \ + XawI18n.c \ + XawI18n.h + +if BUILD_XAW6 + +lib_LTLIBRARIES += libXaw6.la + +libXaw6_la_CFLAGS = \ + -I${top_srcdir}/include \ + -I${top_srcdir}/include/X11/Xaw \ + $(XAW6_CFLAGS) + +libXaw6_la_SOURCES = \ + $(COMMON_SOURCES) + +libXaw6_la_LDFLAGS = -version-info 6:1:0 +libXaw6_la_LIBADD = $(XAW6_LIBS) + +endif + +if BUILD_XAW7 + +lib_LTLIBRARIES += libXaw7.la + +libXaw7_la_CFLAGS = \ + -I${top_srcdir}/include \ + -I${top_srcdir}/include/X11/Xaw \ + -DXAW7 \ + $(XAW7_CFLAGS) + +libXaw7_la_SOURCES = \ + $(COMMON_SOURCES) \ + Tip.c + +libXaw7_la_LDFLAGS = -version-info 7:0:0 +libXaw7_la_LIBADD = $(XAW7_LIBS) + +endif + +if BUILD_XAW8 + +lib_LTLIBRARIES += libXaw8.la + +libXaw8_la_CFLAGS = \ + -I${top_srcdir}/include \ + -I${top_srcdir}/include/X11/Xaw \ + $(XAW8_CFLAGS) + +libXaw8_la_SOURCES = \ + $(COMMON_SOURCES) \ + PrintShell.c \ + Tip.c + +libXaw8_la_LDFLAGS = -version-info 8:0:0 +libXaw8_la_LIBADD = $(XAW8_LIBS) + +endif |