diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 35 | ||||
| -rw-r--r-- | src/Makefile.am | 18 |
3 files changed, 1 insertions, 58 deletions
diff --git a/Makefile.am b/Makefile.am index 1d2a450..c74acb4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1 @@ SUBDIRS = include src - -install-exec-hook: - cd $(DESTDIR)$(libdir) && rm -f libXaw3d.@LIBEXT@ && $(LN_S) $(DEFAULT_LIB) libXaw3d.@LIBEXT@ - -uninstall-local: - -rm -f $(DESTDIR)$(libdir)/libXaw3d.@LIBEXT@ diff --git a/configure.ac b/configure.ac index 50e38f7..80931fc 100644 --- a/configure.ac +++ b/configure.ac @@ -20,41 +20,8 @@ AM_PROG_CC_C_O # is in an if statement, and later calls would break if it's skipped. PKG_PROG_PKG_CONFIG -# -# fix libtool to set SONAME to libXaw3d.so.$major -# -AC_CONFIG_COMMANDS([libtool_hack], [ - cp -f libtool libtool_ - test -z "$SED" && SED=sed - $SED '1,/^soname_spec/{ -/^soname_spec/i\ -# X.Org hack to match monolithic Xaw3d SONAME\ -xorglibxawname="libXaw3d" -/^soname_spec/s/libname/xorglibxawname/ -}' libtool_ > libtool - rm -f libtool_ -]) - -# OSX/Win32 rules are different. -platform_win32=no -platform_darwin=no -LIBEXT=so -case $host_os in - cygwin*|mingw*) - LIBEXT=dll.a - platform_win32=yes - ;; - darwin*) - LIBEXT=dylib - platform_darwin=yes - ;; -esac -AC_SUBST(LIBEXT) -AM_CONDITIONAL(PLATFORM_WIN32, test "x$platform_win32" = "xyes") -AM_CONDITIONAL(PLATFORM_DARWIN, test "x$platform_darwin" = "xyes") - # Checks for header files. -PKG_CHECK_MODULES(X11, [x11, xt, xmu]) +PKG_CHECK_MODULES(X11, [x11 xt xmu]) AC_CHECK_HEADERS([wctype.h wchar.h widec.h]) AC_CONFIG_FILES([Makefile diff --git a/src/Makefile.am b/src/Makefile.am index e3469eb..7766657 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,22 +65,4 @@ libXaw3d_la_CPPFLAGS = \ libXaw3d_la_LDFLAGS = -version-info 8:0:0 -no-undefined -if !PLATFORM_WIN32 -install-exec-hook:: -if PLATFORM_DARWIN - -rm -f $(DESTDIR)$(libdir)/libXaw3d.8.@LIBEXT@ - (cd $(DESTDIR)$(libdir) && ln -s libXaw3d.8.@LIBEXT@ libXaw3d.8.@LIBEXT@) -else - -rm -f $(DESTDIR)$(libdir)/libXaw3d.@LIBEXT@.8 - (cd $(DESTDIR)$(libdir) && ln -s libXaw3d.@LIBEXT@.8 libXaw3d.@LIBEXT@.8) -endif - -uninstall-local:: -if PLATFORM_DARWIN - -rm -f $(DESTDIR)$(libdir)/libXaw3d.8.@LIBEXT@ -else - -rm -f $(DESTDIR)$(libdir)/libXaw3d.@LIBEXT@.8 -endif -endif - EXTRA_DIST = sharedlib.c |