Changeset 538 for trunk/src/cygwin/Makefile.in

Timestamp:

01/24/10 19:55:24 (2 years ago)

Author:

eagle

Message:

• options are parsed sequentially (-f and -I first)
• config file is always read from SYSCONFDIR (usually /etc or /usr/local/etc)
• changed Makefile.am to not install header files

File:

• trunk/src/cygwin/Makefile.in (modified) (8 diffs)

trunk/src/cygwin/Makefile.in

@@ -38 +38 @@
 host_triplet = @host@
 subdir = src/cygwin
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
         $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -50 +50 @@
 SOURCES =
 DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(includedir)"
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -150 +142 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-include_HEADERS = ocat_cygwin.h openbsd_netinet_icmp6.h openbsd_netinet_if_ether.h openbsd_netinet_ip6.h
+noinst_HEADERS = ocat_cygwin.h openbsd_netinet_icmp6.h openbsd_netinet_if_ether.h openbsd_netinet_ip6.h
 all: all-am
 
@@ -184 +176 @@
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
-install-includeHEADERS: $(include_HEADERS)
-        @$(NORMAL_INSTALL)
-        test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
-        @list='$(include_HEADERS)'; for p in $$list; do \
-          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-          f=$(am__strip_dir) \
-          echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-          $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-        done
-
-uninstall-includeHEADERS:
-        @$(NORMAL_UNINSTALL)
-        @list='$(include_HEADERS)'; for p in $$list; do \
-          f=$(am__strip_dir) \
-          echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-          rm -f "$(DESTDIR)$(includedir)/$$f"; \
-        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -281 +256 @@
 all-am: Makefile $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(includedir)"; do \
-          test -z "$$dir" || $(mkdir_p) "$$dir"; \
-        done
 install: install-am
 install-exec: install-exec-am
@@ -326 +298 @@
 info-am:
 
-install-data-am: install-includeHEADERS
+install-data-am:
 
 install-exec-am:
@@ -352 +324 @@
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS uninstall-info-am
+uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
@@ -358 +330 @@
         dvi-am html html-am info info-am install install-am \
         install-data install-data-am install-exec install-exec-am \
-        install-includeHEADERS install-info install-info-am \
-        install-man install-strip installcheck installcheck-am \
-        installdirs maintainer-clean maintainer-clean-generic \
-        mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-        uninstall uninstall-am uninstall-includeHEADERS \
-        uninstall-info-am
+        install-info install-info-am install-man install-strip \
+        installcheck installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+        pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.