Changeset 1f3696b for lib/Makefile.in

Timestamp:

08/11/04 14:44:20 (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:

ffe76f8

Parents:

e619d90

Message:

Slight changes to code, basically #includes and #defines, and it should build cleanly on freebsd now.

File:

• lib/Makefile.in (modified) (9 diffs)

lib/Makefile.in

@@ -59 +59 @@
 host_triplet = @host@
 AMTAR = @AMTAR@
+AR = @AR@
 AS = @AS@
 AWK = @AWK@
 CC = @CC@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+GCJ = @GCJ@
+GCJFLAGS = @GCJFLAGS@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIBPCAP = @LIBPCAP@
@@ -77 +84 @@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
@@ -85 +93 @@
 lib_LTLIBRARIES = libtrace.la
 libtrace_la_SOURCES = trace.c fifo.c fifo.h common.h
-lib_HEADERS = libtrace.h dagformat.h wag.h
+include_HEADERS = libtrace.h dagformat.h wag.h
 libtrace_la_LIBADD = @LIBPCAP@ @LIBZ@
 libtrace_la_LDFLAGS = -version-info 2:0:0 @LIBPCAP_PATH@ @LIBZ_PATH@
@@ -114 +122 @@
 CFLAGS = @CFLAGS@
 DIST_SOURCES = $(libtrace_la_SOURCES)
-HEADERS = $(lib_HEADERS)
-
-DIST_COMMON = $(lib_HEADERS) Makefile.am Makefile.in
+HEADERS = $(include_HEADERS)
+
+DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
 SOURCES = $(libtrace_la_SOURCES)
 
@@ -192 +200 @@
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
-install-libHEADERS: $(lib_HEADERS)
+install-includeHEADERS: $(include_HEADERS)
         @$(NORMAL_INSTALL)
-        $(mkinstalldirs) $(DESTDIR)$(libdir)
-        @list='$(lib_HEADERS)'; for p in $$list; do \
+        $(mkinstalldirs) $(DESTDIR)$(includedir)
+        @list='$(include_HEADERS)'; for p in $$list; do \
           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
           f="`echo $$p | sed -e 's|^.*/||'`"; \
-          echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(libdir)/$$f"; \
-          $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(libdir)/$$f; \
-        done
-
-uninstall-libHEADERS:
+          echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
+          $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+        done
+
+uninstall-includeHEADERS:
         @$(NORMAL_UNINSTALL)
-        @list='$(lib_HEADERS)'; for p in $$list; do \
+        @list='$(include_HEADERS)'; for p in $$list; do \
           f="`echo $$p | sed -e 's|^.*/||'`"; \
-          echo " rm -f $(DESTDIR)$(libdir)/$$f"; \
-          rm -f $(DESTDIR)$(libdir)/$$f; \
+          echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
+          rm -f $(DESTDIR)$(includedir)/$$f; \
         done
 
@@ -268 +276 @@
 
 installdirs:
-        $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)
+        $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
 
 install: install-am
@@ -311 +319 @@
 info-am:
 
-install-data-am:
-
-install-exec-am: install-libHEADERS install-libLTLIBRARIES
+install-data-am: install-includeHEADERS
+
+install-exec-am: install-libLTLIBRARIES
 
 install-info: install-info-am
@@ -330 +338 @@
         mostlyclean-libtool
 
-uninstall-am: uninstall-info-am uninstall-libHEADERS \
+uninstall-am: uninstall-includeHEADERS uninstall-info-am \
         uninstall-libLTLIBRARIES
 
@@ -338 +346 @@
         distclean-tags distdir dvi dvi-am info info-am install \
         install-am install-data install-data-am install-exec \
-        install-exec-am install-info install-info-am install-libHEADERS \
-        install-libLTLIBRARIES install-man install-strip installcheck \
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool tags uninstall \
-        uninstall-am uninstall-info-am uninstall-libHEADERS \
-        uninstall-libLTLIBRARIES
+        install-exec-am install-includeHEADERS install-info \
+        install-info-am install-libLTLIBRARIES install-man \
+        install-strip installcheck installcheck-am installdirs \
+        maintainer-clean maintainer-clean-generic mostlyclean \
+        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+        tags uninstall uninstall-am uninstall-includeHEADERS \
+        uninstall-info-am uninstall-libLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.