]> cygwin.com Git - cygwin-apps/cygutils.git/blobdiff - Makefile.am
Update to released 1.4.16-6 content
[cygwin-apps/cygutils.git] / Makefile.am
index 9e9b0b01c42cb871194d70da8f2d070fda58fdcf..79eb2b1dec33494136928e845c2388d17dfab758 100644 (file)
@@ -12,9 +12,12 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 if WITH_WINDOWS_PROGRAMS
 windows_progs = src/banner/banner src/clip/getclip src/clip/putclip \
        src/cygstart/cygstart src/lpr/lpr src/mkshortcut/mkshortcut \
-       src/readshortcut/readshortcut
+       src/readshortcut/readshortcut \
+       src/winln/winln
 windows_ltlibraries = src/cygicons/libicons.la
 windows_headers = src/cygicons/cygicons.h
+xdg_menus       = src/cygstart/cygstart.desktop
+xdg_mimes       = src/cygstart/cygutils.xml
 cygicons_docs   = src/cygicons/README
 lpr_docs        = src/lpr/README
 endif
@@ -25,9 +28,13 @@ ipc_progs = src/ipc/semtool src/ipc/shmtool \
 ipc_scripts = src/ipc/ipck
 endif
 
-bin_PROGRAMS = src/ascii/ascii $(windows_progs) src/conv/conv \
+if WITH_CYGWIN_SPECIFIC_PROGRAMS
+cygwin_specific_progs = src/cygdrop/cygdrop
+endif
+
+bin_PROGRAMS = $(windows_progs) src/conv/conv \
        src/dump/dump $(ipc_progs) \
-       src/realpath/realpath
+       $(cygwin_specific_progs)
 
 bin_SCRIPTS = $(ipc_scripts)
 
@@ -41,7 +48,8 @@ include_HEADERS = $(windows_headers)
 man_MANS = src/cygstart/cygstart.1 \
        src/mkshortcut/mkshortcut.1 \
        src/readshortcut/readshortcut.1 \
-       src/lpr/lpr.1
+       src/lpr/lpr.1 \
+       src/winln/winln.1
 
 doc_DATA = \
        AUTHORS COPYING ChangeLog HOW-TO-CONTRIBUTE \
@@ -50,11 +58,20 @@ doc_DATA = \
 licensesdir = $(docdir)/licenses
 licenses_DATA = $(licenses)
 
+xdg_menudir   = $(datadir)/applications
+xdg_menu_DATA = $(xdg_menus)
+
+xdg_mimedir   = $(datadir)/mime/packages
+xdg_mime_DATA = $(xdg_mimes)
+
 EXTRA_PROGRAMS = src/banner/banner src/clip/getclip src/clip/putclip \
        src/cygstart/cygstart \
        src/ipc/semtool src/ipc/shmtool \
        src/ipc/msgtool src/ipc/semstat \
-       src/lpr/lpr src/mkshortcut/mkshortcut src/readshortcut/readshortcut
+       src/lpr/lpr \
+       src/mkshortcut/mkshortcut src/readshortcut/readshortcut \
+       src/cygdrop/cygdrop \
+       src/winln/winln
 
 EXTRA_HEADERS = src/cygicons/cygicons.h
 EXTRA_SCRIPTS = src/ipc/ipck
@@ -73,18 +90,23 @@ po_files = \
 extra_docs = \
        src/lpr/README src/cygicons/README
 
-licenses = licenses/COPYING.BSD-no-advert licenses/COPYING.GPL
+licenses = licenses/COPYING.BSD-no-advert \
+       licenses/COPYING.GPLv2 \
+       licenses/COPYING.GPLv3
 
 cygicons_list = \
   src/cygicons/cygwin-kde.ico  src/cygicons/cygwings.ico \
   src/cygicons/cygwin.ico      src/cygicons/cygwinpurple.ico \
   src/cygicons/cygwinblue.ico  src/cygicons/cygwinred.ico \
   src/cygicons/cygwincyan.ico  src/cygicons/cygwinshiny.ico \
-  src/cygicons/cygwing.ico     src/cygicons/cygwinyellow.ico
+  src/cygicons/cygwing.ico     src/cygicons/cygwinyellow.ico \
+  src/cygicons/hippo.ico
 
 EXTRA_DIST = bootstrap common.h \
    BRANCHES $(man_MANS) $(doc_DATA) $(EXTRA_SCRIPTS) \
-   $(licenses) $(po_files) $(extra_docs) $(cygicons_list)
+   $(licenses) $(po_files) $(extra_docs) $(cygicons_list) \
+   $(xdg_menus) $(xdg_mimes) \
+   src/cygicons/hippo.svg
 
 DISTCLEANFILES = \
        po/Makefile    \
@@ -93,7 +115,7 @@ DISTCLEANFILES = \
        po/remove-potcdate.sed \
        src/cygicons/cygicons.rc
 
-src_ascii_ascii_LDADD               = -lpopt
+libuuid = `${CC} -print-file-name=w32api/libuuid.a`
 src_banner_banner_LDADD             = -lpopt -lkernel32 -lgdi32
 src_clip_getclip_LDADD              = -lpopt
 src_clip_putclip_LDADD              = -lpopt
@@ -101,30 +123,30 @@ src_conv_conv_LDADD                 = -lpopt
 src_cygstart_cygstart_LDADD         = -lpopt
 src_dump_dump_LDADD                 = -lpopt
 src_lpr_lpr_LDADD                   = -lwinspool
-src_mkshortcut_mkshortcut_LDADD     = -lpopt -lole32 -luuid
-src_readshortcut_readshortcut_LDADD = -lpopt -lole32 -luuid
-src_realpath_realpath_LDADD         = -lpopt
+src_mkshortcut_mkshortcut_LDADD     = -lpopt -lole32
+src_mkshortcut_mkshortcut_LDFLAGS   = ${libuuid}
+src_readshortcut_readshortcut_LDADD = -lpopt -lole32
+src_readshortcut_readshortcut_LDFLAGS = ${libuuid}
 
 src_lpr_lpr_SOURCES = \
        src/lpr/Printer.cc    src/lpr/Win32Utils.cc \
        src/lpr/lpr.cc        src/lpr/Printer.hh \
        src/lpr/Win32Utils.hh src/lpr/PrinterException.hh
 
-src_cygicons_libicons_la_SOURCES = \
-       src/cygicons/cygicons.rc \
+dist_src_cygicons_libicons_la_SOURCES = \
        src/cygicons/cygicons.h
+nodist_src_cygicons_libicons_la_SOURCES = \
+       src/cygicons/cygicons.rc
+
 src_cygicons_libicons_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(AM_LDFLAGS)
 
+src_cygdrop_cygdrop_SOURCES  = src/cygdrop/cygdrop.cc
+# This removes the unneeded dependency on cygstdc++-X.dll
+src_cygdrop_cygdrop_CXXFLAGS = -fno-exceptions
+
 install-exec-hook: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
        $(mkdir_p) $(DESTDIR)$(bindir)
-       @t=`echo conv|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-       for p in d2u u2d dos2unix unix2dos; do \
-         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-         f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-         echo "(cd $(DESTDIR)$(bindir) && ln -f $$t $$f)"; \
-         (cd $(DESTDIR)$(bindir) && ln -f $$t $$f); \
-       done
        if [ -e $(DESTDIR)$(libdir)/libicons.dll.a ]; then \
          (cd $(DESTDIR)$(libdir) && mv libicons.dll.a libcygicons.dll.a) ;\
        fi
@@ -141,12 +163,6 @@ install-exec-hook: $(bin_PROGRAMS)
 
 uninstall-hook:
        @$(NORMAL_UNINSTALL)
-       @for p in d2u u2d dos2unix unix2dos; do \
-         p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-         f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-         echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-         rm -f $(DESTDIR)$(bindir)/$$f; \
-       done
        if [ -e $(DESTDIR)$(libdir)/libcygicons.la ]; then \
           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/libcygicons.la'"; \
           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/libcygicons.la"; \
@@ -154,13 +170,18 @@ uninstall-hook:
 
 # hacks for RC support
 RCFLAGS = -I$(top_builddir)/src/cygicons -I$(top_srcdir)/src/cygicons
-
-LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \
-       `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(RCFLAGS) |\
+ltrc_verbose = $(ltrc_verbose_$(V))
+ltrc_verbose_ = $(ltrc_verbose_$(AM_DEFAULT_VERBOSITY))
+ltrc_verbose_0 = @echo "  CCRC  " $@;
+
+LTRCCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=compile $(RC) \
+       `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_RCFLAGS) $(RCFLAGS) |\
        sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
 
 .rc.lo:
-       $(LTRCCOMPILE) -i $< -o $@
+       $(ltrc_verbose)$(LTRCCOMPILE) -i $< -o $@
 
 ## Extra dependencies for cygicons.lo
 src/cygicons/cygicons.lo: src/cygicons/cygicons.rc $(cygicons_list) src/cygicons/cygicons.h
This page took 0.0232290000000001 seconds and 5 git commands to generate.