Merge pull request #23 from ajneu/master1

[can-utils.git] / GNUmakefile.am

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 9b30d9c8b92f9bef2c96b57020535e33fe219545..580e60d364c26fe3f43fb532fd3d14ae8b7dffe7 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I config/m4
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_builddir)/include \
@@ -8,6 +10,7 @@ LDADD = \
        libcan.la
 
 noinst_HEADERS = \
+       canframelen.h \
        lib.h \
        terminal.h \
        include/linux/can/bcm.h \
@@ -16,21 +19,15 @@ noinst_HEADERS = \
        include/linux/can.h \
        include/linux/can/isotp.h \
        include/linux/can/netlink.h \
-       include/linux/can/raw.h \
-       include/socketcan/can/bcm.h \
-       include/socketcan/can/error.h \
-       include/socketcan/can/gw.h \
-       include/socketcan/can.h \
-       include/socketcan/can/isotp.h \
-       include/socketcan/can/netlink.h \
-       include/socketcan/can/raw.h
+       include/linux/can/raw.h
 
 
 noinst_LTLIBRARIES = \
        libcan.la
 
 libcan_la_SOURCES = \
-       lib.c
+       lib.c \
+       canframelen.c
 
 
 bin_PROGRAMS = \
@@ -47,6 +44,7 @@ bin_PROGRAMS = \
        cansend \
        cansniffer \
        isotpdump \
+       isotpperf \
        isotprecv \
        isotpsend \
        isotpserver \
@@ -84,4 +82,3 @@ MAINTAINERCLEANFILES = \
 maintainer-clean-local:
        -chmod -R a+rw $(distdir)
        -rm -fr $(distdir)
-