diff options
| author | Charlemagne Lasse <charlemagnelasse@gmail.com> | 2017-12-11 10:03:43 (GMT) |
|---|---|---|
| committer | Charlemagne Lasse <charlemagnelasse@gmail.com> | 2017-12-11 10:07:25 (GMT) |
| commit | e9064fcb0ab9656b9bf78158cd8abe746486604e (patch) | |
| tree | a90f700616e15e149e497a44ccbec12fdf9fe16d /src/winpcap.mk | |
| parent | 11151e7310ec61d17b78f5004d24aa5ad8153686 (diff) | |
| download | mxe-e9064fcb0ab9656b9bf78158cd8abe746486604e.zip mxe-e9064fcb0ab9656b9bf78158cd8abe746486604e.tar.gz mxe-e9064fcb0ab9656b9bf78158cd8abe746486604e.tar.bz2 | |
winpcap: Fix installation of header files
Not all files mentioned in create_include.bat were installed. This caused
build errors in basically all programs which were using winpcap.
Fixes #1389
Fixes #2004
Diffstat (limited to 'src/winpcap.mk')
| -rw-r--r-- | src/winpcap.mk | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/src/winpcap.mk b/src/winpcap.mk index bbc0ec7..e7092ea 100644 --- a/src/winpcap.mk +++ b/src/winpcap.mk @@ -22,8 +22,6 @@ define $(PKG)_BUILD cd '$(1)' && $(TARGET)-gcc -ICommon -IpacketNtx/Dll -O -c '$(1)/packetNtx/Dll/Packet32.c' $(TARGET)-ar rc '$(1)/libpacket.a' '$(1)/Packet32.o' $(TARGET)-ranlib '$(1)/libpacket.a' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -m644 '$(1)/Common'/*.h '$(PREFIX)/$(TARGET)/include/' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' $(INSTALL) -m644 '$(1)/libpacket.a' '$(PREFIX)/$(TARGET)/lib/' @@ -34,7 +32,31 @@ define $(PKG)_BUILD AR='$(TARGET)-ar' \ RANLIB='$(TARGET)-ranlib' \ $(MAKE) -C '$(1)/wpcap/PRJ' -j 1 libwpcap.a - $(INSTALL) -m644 '$(1)/wpcap/libpcap/'*.h '$(1)/wpcap/Win32-Extensions/'*.h '$(PREFIX)/$(TARGET)/include/' + + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -m644 \ + $(1)/wpcap/libpcap/Win32/Include/IP6_misc.h \ + $(1)/wpcap/libpcap/pcap-namedb.h \ + $(1)/wpcap/libpcap/pcap-bpf.h \ + $(1)/wpcap/libpcap/remote-ext.h \ + $(1)/Common/Packet32.h \ + $(1)/wpcap/Win32-Extensions/Win32-Extensions.h \ + $(1)/wpcap/libpcap/Win32/Include/bittypes.h \ + $(1)/wpcap/libpcap/pcap-stdinc.h \ + $(1)/wpcap/libpcap/pcap.h \ + '$(PREFIX)/$(TARGET)/include/' + + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/pcap' + $(INSTALL) -m644 \ + $(1)/wpcap/libpcap/pcap/namedb.h \ + $(1)/wpcap/libpcap/pcap/sll.h \ + $(1)/wpcap/libpcap/pcap/bpf.h \ + $(1)/wpcap/libpcap/pcap/usb.h \ + $(1)/wpcap/libpcap/pcap/pcap.h \ + $(1)/wpcap/libpcap/pcap/bluetooth.h \ + $(1)/wpcap/libpcap/pcap/vlan.h \ + '$(PREFIX)/$(TARGET)/include/pcap/' + $(INSTALL) -m644 '$(1)/wpcap/PRJ/libwpcap.a' '$(PREFIX)/$(TARGET)/lib/' endef |