Commit f8006f36 authored by Claes Sjofors's avatar Claes Sjofors

pwre build fix for libpcap

parent d08bd91d
...@@ -5,5 +5,5 @@ link_rule_mk := 1 ...@@ -5,5 +5,5 @@ link_rule_mk := 1
$(export_obj) $(pwr_eobj)/rt_io_user.o \ $(export_obj) $(pwr_eobj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib) \ $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib) \
-lpwr_usbio_dummy -lpwr_usb_dummy -lpwr_cifx_dummy -lpwr_nodave_dummy \ -lpwr_usbio_dummy -lpwr_usb_dummy -lpwr_cifx_dummy -lpwr_nodave_dummy \
$(pwre_conf_libpwrprofibus) $(pwre_conf_libpwrpowerlink) -lpcap $(pwre_conf_libpwrprofibus) $(pwre_conf_libpwrpowerlink)
endif endif
...@@ -5,5 +5,5 @@ link_rule_mk := 1 ...@@ -5,5 +5,5 @@ link_rule_mk := 1
$(export_obj) $(pwr_eobj)/rt_io_user.o \ $(export_obj) $(pwr_eobj)/rt_io_user.o \
$(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib) \ $(pwre_conf_libdir) $(pwre_conf_libpwrrt) $(pwre_conf_lib) \
-lpwr_usbio_dummy -lpwr_usb_dummy -lpwr_cifx_dummy -lpwr_nodave_dummy \ -lpwr_usbio_dummy -lpwr_usb_dummy -lpwr_cifx_dummy -lpwr_nodave_dummy \
$(pwre_conf_libpwrprofibus) $(pwre_conf_libpwrpowerlinkcn) -lpcap $(pwre_conf_libpwrprofibus) $(pwre_conf_libpwrpowerlinkcn)
endif endif
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
* General Public License plus this exception. * General Public License plus this exception.
**/ **/
#if defined PWRE_CONF_EPL #if defined PWRE_CONF_EPL && defined PWRE_CONF_LIBPCAP
#include "pwr.h" #include "pwr.h"
#include "rt_io_msg.h" #include "rt_io_msg.h"
......
#if defined PWRE_CONF_EPL #if defined PWRE_CONF_EPL && defined PWRE_CONF_LIBPCAP
#include "Epl.h" #include "Epl.h"
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include "rt_io_m_epl.h" #include "rt_io_m_epl.h"
#include "rt_io_bus.h" #include "rt_io_bus.h"
#if defined PWRE_CONF_EPL #if defined PWRE_CONF_EPL && defined PWRE_CONF_LIBPCAP
#include "Epl.h" #include "Epl.h"
#include <errno.h> #include <errno.h>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include "rt_io_m_epl.h" #include "rt_io_m_epl.h"
#include "rt_io_bus.h" #include "rt_io_bus.h"
#if defined PWRE_CONF_EPL #if defined PWRE_CONF_EPL && defined PWRE_CONF_LIBPCAP
#include "Epl.h" #include "Epl.h"
#include <errno.h> #include <errno.h>
......
...@@ -171,6 +171,9 @@ pwre_config_check_lib() ...@@ -171,6 +171,9 @@ pwre_config_check_lib()
conf_libpowerlink=$conf_libpowerlink" -L$lib_path -l${lib%.*}" conf_libpowerlink=$conf_libpowerlink" -L$lib_path -l${lib%.*}"
elif test $4 == "powerlinkcn"; then elif test $4 == "powerlinkcn"; then
conf_libpowerlinkcn=$conf_libpowerlinkcn" -L$lib_path -l${lib%.*}" conf_libpowerlinkcn=$conf_libpowerlinkcn" -L$lib_path -l${lib%.*}"
elif test $4 == "libpcap"; then
conf_libpowerlink=$conf_libpowerlink" -l${lib%.*}"
conf_libpowerlinkcn=$conf_libpowerlinkcn" -l${lib%.*}"
else else
conf_lib=$conf_lib" -l${lib%%.*}" conf_lib=$conf_lib" -l${lib%%.*}"
fi fi
...@@ -453,6 +456,7 @@ else ...@@ -453,6 +456,7 @@ else
pwre_config_check_lib libusb LIBUSB lib libusb 1 "/usr/lib/libusb-1.0.so:/usr/lib/$hwpl-linux-$gnu/libusb-1.0.so" pwre_config_check_lib libusb LIBUSB lib libusb 1 "/usr/lib/libusb-1.0.so:/usr/lib/$hwpl-linux-$gnu/libusb-1.0.so"
pwre_config_check_lib powerlink POWERLINK lib powerlink 1 "$epl/build/Examples/X86/Generic/powerlink_user_lib/libpowerlink.a" pwre_config_check_lib powerlink POWERLINK lib powerlink 1 "$epl/build/Examples/X86/Generic/powerlink_user_lib/libpowerlink.a"
pwre_config_check_lib powerlinkcn POWERLINKCN lib powerlinkcn 1 "$epl/buildcn/Examples/X86/Generic/powerlink_user_lib/libpowerlink.a" pwre_config_check_lib powerlinkcn POWERLINKCN lib powerlinkcn 1 "$epl/buildcn/Examples/X86/Generic/powerlink_user_lib/libpowerlink.a"
pwre_config_check_lib libpcap LIBPCAP lib libpcap 1 "/usr/lib/libpcap.so:/usr/lib/$hwpl-linux-$gnu/libpcap.so"
pwre_config_check_lib librsvg LIBRSVG lib librsvg 1 "/usr/lib/librsvg-2.so:/usr/lib/$hwpl-linux-$gnu/librsvg-2.so" pwre_config_check_lib librsvg LIBRSVG lib librsvg 1 "/usr/lib/librsvg-2.so:/usr/lib/$hwpl-linux-$gnu/librsvg-2.so"
pwre_config_check_include mq MQ 0 "/usr/local/dmq/include/p_entry.h" pwre_config_check_include mq MQ 0 "/usr/local/dmq/include/p_entry.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment