Changeset 3bc19384 in rtems


Ignore:
Timestamp:
Jun 6, 2017, 1:30:40 PM (2 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
9b035a0a
Parents:
d4ab0aef
git-author:
Sebastian Huber <sebastian.huber@…> (06/06/17 13:30:40)
git-committer:
Sebastian Huber <sebastian.huber@…> (06/07/17 11:02:20)
Message:

network: Move header files

Prevent accidental use of legacy network header files.

Update #2833.

Location:
cpukit/libnetworking
Files:
2 edited
12 moved

Legend:

Unmodified
Added
Removed
  • cpukit/libnetworking/Makefile.am

    rd4ab0aef r3bc19384  
    202202
    203203if !HAS_NEWLIB_20170522_HEADER
    204 include_arpa_HEADERS += arpa/inet.h
    205 include_HEADERS += netdb.h
    206 include_HEADERS += syslog.h
    207 include_net_HEADERS += net/if.h
    208 include_netinet6_HEADERS = netinet6/in6.h
    209 include_netinet_HEADERS += netinet/in.h
    210 include_netinet_HEADERS += netinet/tcp.h
    211 include_sys_HEADERS += sys/_sockaddr_storage.h
    212 include_sys_HEADERS += sys/socket.h
    213 include_sys_HEADERS += sys/syslog.h
    214 include_sys_HEADERS += sys/ttydefaults.h
    215 include_sys_HEADERS += sys/un.h
     204include_arpa_HEADERS += include/arpa/inet.h
     205include_HEADERS += include/netdb.h
     206include_HEADERS += include/syslog.h
     207include_net_HEADERS += include/net/if.h
     208include_netinet6_HEADERS = include/netinet6/in6.h
     209include_netinet_HEADERS += include/netinet/in.h
     210include_netinet_HEADERS += include/netinet/tcp.h
     211include_sys_HEADERS += include/sys/_sockaddr_storage.h
     212include_sys_HEADERS += include/sys/socket.h
     213include_sys_HEADERS += include/sys/syslog.h
     214include_sys_HEADERS += include/sys/ttydefaults.h
     215include_sys_HEADERS += include/sys/un.h
    216216endif
    217217
  • cpukit/libnetworking/preinstall.am

    rd4ab0aef r3bc19384  
    420420
    421421if !HAS_NEWLIB_20170522_HEADER
    422 $(PROJECT_INCLUDE)/arpa/inet.h: arpa/inet.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
     422$(PROJECT_INCLUDE)/arpa/inet.h: include/arpa/inet.h $(PROJECT_INCLUDE)/arpa/$(dirstamp)
    423423        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/arpa/inet.h
    424424PREINSTALL_FILES += $(PROJECT_INCLUDE)/arpa/inet.h
    425425
    426 $(PROJECT_INCLUDE)/netdb.h: netdb.h $(PROJECT_INCLUDE)/$(dirstamp)
     426$(PROJECT_INCLUDE)/netdb.h: include/netdb.h $(PROJECT_INCLUDE)/$(dirstamp)
    427427        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netdb.h
    428428PREINSTALL_FILES += $(PROJECT_INCLUDE)/netdb.h
    429429
    430 $(PROJECT_INCLUDE)/syslog.h: syslog.h $(PROJECT_INCLUDE)/$(dirstamp)
     430$(PROJECT_INCLUDE)/syslog.h: include/syslog.h $(PROJECT_INCLUDE)/$(dirstamp)
    431431        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/syslog.h
    432432PREINSTALL_FILES += $(PROJECT_INCLUDE)/syslog.h
    433433
    434 $(PROJECT_INCLUDE)/net/if.h: net/if.h $(PROJECT_INCLUDE)/net/$(dirstamp)
     434$(PROJECT_INCLUDE)/net/if.h: include/net/if.h $(PROJECT_INCLUDE)/net/$(dirstamp)
    435435        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/net/if.h
    436436PREINSTALL_FILES += $(PROJECT_INCLUDE)/net/if.h
    437437
    438 $(PROJECT_INCLUDE)/netinet6/in6.h: netinet6/in6.h $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
     438$(PROJECT_INCLUDE)/netinet6/in6.h: include/netinet6/in6.h $(PROJECT_INCLUDE)/netinet6/$(dirstamp)
    439439        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet6/in6.h
    440440PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet6/in6.h
    441441
    442 $(PROJECT_INCLUDE)/netinet/in.h: netinet/in.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
     442$(PROJECT_INCLUDE)/netinet/in.h: include/netinet/in.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
    443443        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/in.h
    444444PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/in.h
    445445
    446 $(PROJECT_INCLUDE)/netinet/tcp.h: netinet/tcp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
     446$(PROJECT_INCLUDE)/netinet/tcp.h: include/netinet/tcp.h $(PROJECT_INCLUDE)/netinet/$(dirstamp)
    447447        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/netinet/tcp.h
    448448PREINSTALL_FILES += $(PROJECT_INCLUDE)/netinet/tcp.h
    449449
    450 $(PROJECT_INCLUDE)/sys/_sockaddr_storage.h: sys/_sockaddr_storage.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
     450$(PROJECT_INCLUDE)/sys/_sockaddr_storage.h: include/sys/_sockaddr_storage.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
    451451        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/_sockaddr_storage.h
    452452PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/_sockaddr_storage.h
    453453
    454 $(PROJECT_INCLUDE)/sys/socket.h: sys/socket.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
     454$(PROJECT_INCLUDE)/sys/socket.h: include/sys/socket.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
    455455        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/socket.h
    456456PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/socket.h
    457457
    458 $(PROJECT_INCLUDE)/sys/syslog.h: sys/syslog.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
     458$(PROJECT_INCLUDE)/sys/syslog.h: include/sys/syslog.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
    459459        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/syslog.h
    460460PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/syslog.h
    461461
    462 $(PROJECT_INCLUDE)/sys/ttydefaults.h: sys/ttydefaults.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
     462$(PROJECT_INCLUDE)/sys/ttydefaults.h: include/sys/ttydefaults.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
    463463        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttydefaults.h
    464464PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttydefaults.h
    465465
    466 $(PROJECT_INCLUDE)/sys/un.h: sys/un.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
     466$(PROJECT_INCLUDE)/sys/un.h: include/sys/un.h $(PROJECT_INCLUDE)/sys/$(dirstamp)
    467467        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/un.h
    468468PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/un.h
Note: See TracChangeset for help on using the changeset viewer.