Changeset 9eaa7de

Timestamp:

08/10/04 17:18:15 (17 years ago)

Author:

Daniel Lawson <dlawson@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

5131592

Parents:

0a46fbb

Message:

poink

Files:

• Makefile.in (modified) (8 diffs)
• config.h.in (modified) (1 diff)
• configure (modified) (3 diffs)

Makefile.in

@@ -88 +88 @@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/lib/config.h
+CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
@@ -96 +96 @@
         install-exec-recursive installdirs-recursive install-recursive \
         uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-        Makefile.in NEWS aclocal.m4 config.guess config.sub configure \
-        configure.in depcomp install-sh ltmain.sh missing mkinstalldirs
-all: all-recursive
+DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
+        Makefile.am Makefile.in NEWS aclocal.m4 config.guess \
+        config.h.in config.sub configure configure.in depcomp \
+        install-sh ltmain.sh missing mkinstalldirs
+all: config.h
+        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
@@ -126 +128 @@
 $(ACLOCAL_M4):  configure.in 
         cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+config.h: stamp-h
+        @if test ! -f $@; then \
+                rm -f stamp-h; \
+                $(MAKE) stamp-h; \
+        else :; fi
+stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+        @rm -f stamp-h stamp-hT
+        @echo timestamp > stamp-hT 2> /dev/null
+        cd $(top_builddir) \
+          && CONFIG_FILES= CONFIG_HEADERS=config.h \
+             $(SHELL) ./config.status
+        @mv stamp-hT stamp-h
+$(srcdir)/config.h.in:  $(srcdir)/./stamp-h.in
+        @if test ! -f $@; then \
+                rm -f $(srcdir)/./stamp-h.in; \
+                $(MAKE) $(srcdir)/./stamp-h.in; \
+        else :; fi
+$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+        @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
+        @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
+        cd $(top_srcdir) && $(AUTOHEADER)
+        @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in
+
+distclean-hdr:
+        -rm -f config.h
 uninstall-info-am:
 
@@ -194 +221 @@
         mkid -fID $$unique $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
                 $(TAGS_FILES) $(LISP)
         tags=; \
@@ -209 +236 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-          || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
+        test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+          || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)
 
 GTAGS:
@@ -301 +328 @@
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile config.h
 installdirs: installdirs-recursive
 installdirs-am:
@@ -337 +364 @@
 distclean: distclean-recursive
         -rm -f config.status config.cache config.log
-distclean-am: clean-am distclean-generic distclean-libtool \
+distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
         distclean-tags
 
@@ -372 +399 @@
 .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
         clean-generic clean-libtool clean-recursive dist dist-all \
-        distcheck distclean distclean-generic distclean-libtool \
-        distclean-recursive distclean-tags distdir dvi dvi-am \
-        dvi-recursive info info-am info-recursive install install-am \
-        install-data install-data-am install-data-recursive \
+        distcheck distclean distclean-generic distclean-hdr \
+        distclean-libtool distclean-recursive distclean-tags distdir \
+        dvi dvi-am dvi-recursive info info-am info-recursive install \
+        install-am install-data install-data-am install-data-recursive \
         install-exec install-exec-am install-exec-recursive \
         install-info install-info-am install-info-recursive install-man \

config.h.in

@@ -1 @@
-/* lib/config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.in by autoheader.  */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */

configure

@@ -1723 +1723 @@
 
 
-                                                    ac_config_headers="$ac_config_headers lib/config.h"
+                                                    ac_config_headers="$ac_config_headers config.h"
 
 ac_ext=c
@@ -9168 +9168 @@
   "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  "lib/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS lib/config.h" ;;
+  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -9717 +9717 @@
   # Run the commands associated with the file.
   case $ac_file in
-    lib/config.h ) # update the timestamp
-echo timestamp >"lib/stamp-h1"
+    config.h ) # update the timestamp
+echo timestamp >"./stamp-h1"
  ;;
   esac