Changeset 538 for trunk/src/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/Makefile.in (modified) (9 diffs)

trunk/src/Makefile.in

@@ -40 +40 @@
 bin_PROGRAMS = ocat$(EXEEXT)
 subdir = src
-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 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
+am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -71 +71 @@
 SOURCES = $(ocat_SOURCES)
 DIST_SOURCES = $(ocat_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|^.*/||'`;
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
+HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -171 +164 @@
 target_alias = @target_alias@
 ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c ocat_netdesc.c
-include_HEADERS = ocat.h ocat_netdesc.h strlcpy.c strlcat.c
+noinst_HEADERS = ocat.h ocat_netdesc.h strlcpy.c strlcat.c
+AM_CFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\"
 all: all-am
 
@@ -271 +265 @@
 @am__fastdepCC_FALSE@   $(COMPILE) -c `$(CYGPATH_W) '$<'`
 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)
@@ -368 +345 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
+        for dir in "$(DESTDIR)$(bindir)"; do \
           test -z "$$dir" || $(mkdir_p) "$$dir"; \
         done
@@ -415 +392 @@
 info-am:
 
-install-data-am: install-includeHEADERS
+install-data-am:
 
 install-exec-am: install-binPROGRAMS
@@ -444 +421 @@
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
-        uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
@@ -452 +428 @@
         html-am info info-am install install-am install-binPROGRAMS \
         install-data install-data-am install-exec install-exec-am \
-        install-exec-hook install-includeHEADERS install-info \
-        install-info-am install-man install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-        uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \
+        install-exec-hook install-info install-info-am install-man \
+        install-strip installcheck installcheck-am installdirs \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+        tags uninstall uninstall-am uninstall-binPROGRAMS \
         uninstall-info-am