Mercurial > dwindows
changeset 2111:37ce3e22ee1a
GTK: Split installdwtest into a separate make rule and don't enable it when
building for MacOS. dwtest is not usable on MacOS without the bundle and
the desktop file is completely unused.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Wed, 17 Jun 2020 16:50:24 +0000 |
| parents | e6d212a978fe |
| children | b33d020b04e7 |
| files | Makefile.in configure configure.in |
| diffstat | 3 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Wed Jun 17 08:43:11 2020 +0000 +++ b/Makefile.in Wed Jun 17 16:50:24 2020 +0000 @@ -14,8 +14,9 @@ TARGET = @TARGET@ SRCS = $(srcdir)/$(DW_DIR)/$(DW_SRC) BROWSER_OBJECT=@BROWSER_OBJECT@ -COMPAT_OBJECT=@COMPAT_OBJECT@ +COMPAT_OBJECT =@COMPAT_OBJECT@ INSTALL_COMPAT=@INSTALL_COMPAT@ +INSTALL_TEST =@INSTALL_TEST@ OBJECTS = dw.o $(BROWSER_OBJECT) SRCS2 = $(srcdir)dwcompat.c OBJECTS2= $(COMPAT_OBJECT) @@ -82,20 +83,17 @@ all: $(TARGETS) dwtest -install: installbase $(INSTALL_COMPAT) +install: installbase $(INSTALL_COMPAT) $(INSTALL_TEST) installbase: $(SYSCONF_LINK_TARGET) $(INSTALL) -d $(prefix)/include; \ $(INSTALL) -d $(prefix)/lib; \ $(INSTALL) -d $(prefix)/bin; \ - $(INSTALL) -d $(prefix)/share/applications; \ $(INSTALL) -d $(prefix)/share/man/man1; \ $(INSTALL) -d $(prefix)/lib/pkgconfig; \ $(INSTALL) $(srcdir)/dw.h $(prefix)/include; \ sed -e 's/@DW_MAJOR_VERSION@/'$(VER_MAJ)'/' -e 's/@DW_MINOR_VERSION@/'$(VER_MIN)'/' -e 's/@DW_SUB_VERSION@/'$(VER_REV)'/' < dwindows-config1 > dwindows-config $(INSTALL) dwindows-config $(prefix)/bin; \ - $(INSTALL) dwtest $(prefix)/bin; \ - $(INSTALL) org.dbsoft.dwindows.dwtest.desktop $(prefix)/share/applications/ sed -e 's/@VERSION@/'$(VER_MAJ).$(VER_MIN).$(VER_REV)'/' < dwindows1.pc > dwindows.pc $(INSTALL) dwindows.pc $(prefix)/lib/pkgconfig; \ $(INSTALL) $(srcdir)/dwindows-config.1 $(prefix)/share/man/man1; \ @@ -106,6 +104,12 @@ ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX); \ ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ) +installdwtest: dwtest + $(INSTALL) -d $(prefix)/bin; \ + $(INSTALL) -d $(prefix)/share/applications; \ + $(INSTALL) dwtest $(prefix)/bin; \ + $(INSTALL) org.dbsoft.dwindows.dwtest.desktop $(prefix)/share/applications/ + installdwcompat: $(SYSCONF_LINK_TARGET2) $(INSTALL) -d $(prefix)/lib; \ $(INSTALL) $(SYSCONF_LINK_TARGET2) $(prefix)/lib; \
--- a/configure Wed Jun 17 08:43:11 2020 +0000 +++ b/configure Wed Jun 17 16:50:24 2020 +0000 @@ -622,6 +622,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS ARCH +INSTALL_TEST INSTALL_COMPAT COMPAT_OBJECT BROWSER_OBJECT @@ -2255,7 +2256,7 @@ SOSUFFIX=so LIBSUFFIX=a LIBPREFIX=lib - +INSTALL_TEST="installdwtest" INCLUDES="-I." ac_ext=c @@ -4659,6 +4660,7 @@ LIBS="$LIBS -framework Cocoa -framework WebKit" save_libs="$LIBS" LIBS="$LIBS -framework UserNotifications" + INSTALL_TEST="" ac_fn_c_check_func "$LINENO" "exit" "ac_cv_func_exit" if test "x$ac_cv_func_exit" = xyes; then : @@ -6527,6 +6529,7 @@ + ac_config_files="$ac_config_files Makefile dwindows1.pc dwindows-config1 org.dbsoft.dwindows.dwtest.desktop" cat >confcache <<\_ACEOF
--- a/configure.in Wed Jun 17 08:43:11 2020 +0000 +++ b/configure.in Wed Jun 17 16:50:24 2020 +0000 @@ -15,7 +15,7 @@ SOSUFFIX=so LIBSUFFIX=a LIBPREFIX=lib - +INSTALL_TEST="installdwtest" INCLUDES="-I." AC_PROG_CC @@ -146,6 +146,7 @@ LIBS="$LIBS -framework Cocoa -framework WebKit" save_libs="$LIBS" LIBS="$LIBS -framework UserNotifications" + INSTALL_TEST="" AC_CHECK_FUNC(exit, , [LIBS="$save_libs"]) build_gtk="no" ;; @@ -308,6 +309,7 @@ AC_SUBST(BROWSER_OBJECT) AC_SUBST(COMPAT_OBJECT) AC_SUBST(INSTALL_COMPAT) +AC_SUBST(INSTALL_TEST) AC_SUBST(ARCH)