Merging with cmake branch. Adding correct include install path

diff --cc src/protocols/CMakeLists.txt
index 9e32c6167145f81e6ba42a9889609857f8fdc9d5,f99ed4f0552b61ab8a5c9465e2721fdb19633474..93ba18637c96c8cdc0442357f42c3dca53a557fa
--- 1/src/protocols/CMakeLists.txt
--- 2/src/protocols/CMakeLists.txt
+++ b/src/protocols/CMakeLists.txt
@@@ -1,22 -1,23 +1,30 @@@
  
 -set (PROTOCOL_HEADERS
 +add_library (protocols
 +    ipv4.h
 +    tcp.h
      packet.h
-     packet.cc
 -    sf_protocols.h
 +    ipv6.h
 +    udp.h
 +    eth.h
 +    icmp4.h
 +    icmp6.h
 +    gre.h
 +    gtp.h
 +    arp.h
 +    wlan.h
 +    teredo.h
 +    mpls.h
 +    ethertypes.h
 +    protocol_numbers.h
 +    undefined_protocols.h
  )
  
 -    checksum.h
 -    decode.cc 
 -    decode.h 
 -    encode.cc 
 -    encode.h 
 -    decode_module.cc
 -    decode_module.h
 -    sf_protocols.h
+ add_library (protocols STATIC
 -
++    packet.cc
+     ${PROTOCOL_HEADERS}
+ )
+ 
+ install (FILES ${PROTOCOL_HEADERS}
+     DESTINATION "${INCLUDE_INSTALL_PATH}/protocols"
+ )
+