Mercurial > dwindows
changeset 2109:068681933258
GTK: Add dwtest to install rules and a desktop link required for
notifications. Also added missing rules to uninstall and distclean.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Wed, 17 Jun 2020 08:41:18 +0000 |
| parents | 35abef6e33a9 |
| children | e6d212a978fe |
| files | Makefile.in configure configure.in org.dbsoft.dwindows.dwtest.desktop |
| diffstat | 4 files changed, 35 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Wed Jun 17 03:38:21 2020 +0000 +++ b/Makefile.in Wed Jun 17 08:41:18 2020 +0000 @@ -88,11 +88,14 @@ $(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; \ @@ -119,9 +122,12 @@ rm -f $(prefix)/lib/lib$(TARGET).$(SOSUFFIX).$(VER_MAJ) rm -f $(prefix)/lib/lib$(TARGET).$(SOSUFFIX) rm -f $(prefix)/lib/lib$(TARGET).$(SOSUFFIX).$(VER_MAJ).$(VER_MIN) + rm -f $(prefix)/lib/pkgconfig/dwindows.pc rm -f $(prefix)/bin/dwindows-config + rm -f $(prefix)/bin/dwtest rm -f $(prefix)/include/dwcompat.h rm -f $(prefix)/include/dw.h + rm -f $(prefix)/share/applications/org.dbsoft.dwindows.dwtest.desktop rm -f $(prefix)/share/man/man1/dwindows-config.1.gz deb: dist @@ -130,8 +136,10 @@ (cd tmp;tar zxvf ../../$(srcdir)/$(SRCDIR).tar.gz;cd $(SRCDIR);dpkg-buildpackage -rfakeroot;cd ..;ls -l) distclean: clean - rm -f config.status - rm -f dwindows-config dwindows-config1 + rm -f config.status config.log config.h + rm -f dwindows-config dwindows-config1 dwindows.pc dwindows1.pc + rm -f org.dbsoft.dwindows.dwtest.desktop + rm -f Makefile clean: rm -f *.$(SOSUFFIX)
--- a/configure Wed Jun 17 03:38:21 2020 +0000 +++ b/configure Wed Jun 17 08:41:18 2020 +0000 @@ -711,6 +711,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -799,6 +800,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1051,6 +1053,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1188,7 +1199,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1341,6 +1352,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -6515,7 +6527,7 @@ -ac_config_files="$ac_config_files Makefile dwindows1.pc dwindows-config1" +ac_config_files="$ac_config_files Makefile dwindows1.pc dwindows-config1 org.dbsoft.dwindows.dwtest.desktop" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7211,6 +7223,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "dwindows1.pc") CONFIG_FILES="$CONFIG_FILES dwindows1.pc" ;; "dwindows-config1") CONFIG_FILES="$CONFIG_FILES dwindows-config1" ;; + "org.dbsoft.dwindows.dwtest.desktop") CONFIG_FILES="$CONFIG_FILES org.dbsoft.dwindows.dwtest.desktop" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac
--- a/configure.in Wed Jun 17 03:38:21 2020 +0000 +++ b/configure.in Wed Jun 17 08:41:18 2020 +0000 @@ -314,5 +314,6 @@ AC_CONFIG_FILES([ Makefile dwindows1.pc -dwindows-config1 ]) +dwindows-config1 +org.dbsoft.dwindows.dwtest.desktop ]) AC_OUTPUT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/org.dbsoft.dwindows.dwtest.desktop Wed Jun 17 08:41:18 2020 +0000 @@ -0,0 +1,8 @@ + +[Desktop Entry] +Name=Dynamic Windows Test +Exec=/usr/local/bin/dwtest +Terminal=false +MultipleArgs=false +Type=Application +Categories=Application;Development;X-Red-Hat-Base;