From 72f9937b62b490f22f9324711b82aa1cb97c36c9 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 23 Aug 1999 18:48:07 +0000 Subject: Removed need for use of separate include/networking directory. --- c/src/lib/libnetworking/include/Makefile.in | 30 ++++++++++++++--------------- c/src/libnetworking/include/Makefile.in | 30 ++++++++++++++--------------- c/src/make/compilers/gcc-target-default.cfg | 10 +++------- make/compilers/gcc-target-default.cfg | 10 +++------- 4 files changed, 36 insertions(+), 44 deletions(-) diff --git a/c/src/lib/libnetworking/include/Makefile.in b/c/src/lib/libnetworking/include/Makefile.in index 7486315f39..61afa340b0 100644 --- a/c/src/lib/libnetworking/include/Makefile.in +++ b/c/src/lib/libnetworking/include/Makefile.in @@ -62,11 +62,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs -INSTALLDIRS = $(PROJECT_INCLUDE)/networking \ - $(PROJECT_INCLUDE)/networking/sys $(PROJECT_INCLUDE)/networking/machine \ - $(PROJECT_INCLUDE)/networking/rtems $(PROJECT_INCLUDE)/networking/vm \ - $(PROJECT_INCLUDE)/networking/net $(PROJECT_INCLUDE)/networking/netinet \ - $(PROJECT_INCLUDE)/networking/arpa $(PROJECT_INCLUDE)/networking/nfs +INSTALLDIRS = $(PROJECT_INCLUDE) \ + $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/machine \ + $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/vm \ + $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \ + $(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/nfs $(INSTALLDIRS): @$(mkinstalldirs) $(INSTALLDIRS) @@ -77,16 +77,16 @@ CLOBBER_ADDITIONS += # We only make the install point for the networking header files if needed. preinstall: $(INSTALLDIRS) $(SRCS) - @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking - @$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys - @$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems - @$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine - @$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm - @$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net - @$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet - @$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa - @$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs - @$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys + @$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems + @$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/machine + @$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/vm + @$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/net + @$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/netinet + @$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/arpa + @$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/nfs + @$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE) all: preinstall diff --git a/c/src/libnetworking/include/Makefile.in b/c/src/libnetworking/include/Makefile.in index 7486315f39..61afa340b0 100644 --- a/c/src/libnetworking/include/Makefile.in +++ b/c/src/libnetworking/include/Makefile.in @@ -62,11 +62,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg INSTALL_CHANGE = @INSTALL_CHANGE@ mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs -INSTALLDIRS = $(PROJECT_INCLUDE)/networking \ - $(PROJECT_INCLUDE)/networking/sys $(PROJECT_INCLUDE)/networking/machine \ - $(PROJECT_INCLUDE)/networking/rtems $(PROJECT_INCLUDE)/networking/vm \ - $(PROJECT_INCLUDE)/networking/net $(PROJECT_INCLUDE)/networking/netinet \ - $(PROJECT_INCLUDE)/networking/arpa $(PROJECT_INCLUDE)/networking/nfs +INSTALLDIRS = $(PROJECT_INCLUDE) \ + $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/machine \ + $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/vm \ + $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \ + $(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/nfs $(INSTALLDIRS): @$(mkinstalldirs) $(INSTALLDIRS) @@ -77,16 +77,16 @@ CLOBBER_ADDITIONS += # We only make the install point for the networking header files if needed. preinstall: $(INSTALLDIRS) $(SRCS) - @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking - @$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys - @$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems - @$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine - @$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm - @$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net - @$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet - @$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa - @$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs - @$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking + @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE) + @$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys + @$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems + @$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/machine + @$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/vm + @$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/net + @$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/netinet + @$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/arpa + @$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/nfs + @$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE) all: preinstall diff --git a/c/src/make/compilers/gcc-target-default.cfg b/c/src/make/compilers/gcc-target-default.cfg index 835b22c558..529bc4b742 100644 --- a/c/src/make/compilers/gcc-target-default.cfg +++ b/c/src/make/compilers/gcc-target-default.cfg @@ -27,10 +27,6 @@ CFLAGS = $(CFLAGS_DEFAULT) $(XCFLAGS) CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS) ASFLAGS = $(CPU_ASFLAGS) $(XASFLAGS) -# We only include the header files for networking if it is enabled. -INCLUDE_NETWORKING_yes_V = -I$(PROJECT_INCLUDE)/networking -INCLUDE_NETWORKING = $(INCLUDE_NETWORKING_$(HAS_NETWORKING)_V) - ifeq ($(RTEMS_USE_GCC272),yes) ifeq ($(RTEMS_CROSS_TARGET),no) @@ -40,7 +36,7 @@ endif # Used for posix bsps CPPFLAGS += \ - -I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \ + -I$(PROJECT_INCLUDE) \ $(RTEMS_LIBC_INCLUDES) else # Used for embedded bsps @@ -48,7 +44,7 @@ else GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED)) CPPFLAGS += -nostdinc \ - -I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \ + -I$(PROJECT_INCLUDE) \ -I$(GCC_INCLUDE) \ -I$(RTEMS_LIBC_DIR)/sys-include \ -I$(RTEMS_LIBC_DIR)/include @@ -72,7 +68,7 @@ GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems CC += $(GCCSPECS) CXX += $(GCCSPECS) -CPPFLAGS += $(INCLUDE_NETWORKING) +CPPFLAGS += # default location of Standard C Library ifndef LIBC_LIBC diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg index 835b22c558..529bc4b742 100644 --- a/make/compilers/gcc-target-default.cfg +++ b/make/compilers/gcc-target-default.cfg @@ -27,10 +27,6 @@ CFLAGS = $(CFLAGS_DEFAULT) $(XCFLAGS) CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS) ASFLAGS = $(CPU_ASFLAGS) $(XASFLAGS) -# We only include the header files for networking if it is enabled. -INCLUDE_NETWORKING_yes_V = -I$(PROJECT_INCLUDE)/networking -INCLUDE_NETWORKING = $(INCLUDE_NETWORKING_$(HAS_NETWORKING)_V) - ifeq ($(RTEMS_USE_GCC272),yes) ifeq ($(RTEMS_CROSS_TARGET),no) @@ -40,7 +36,7 @@ endif # Used for posix bsps CPPFLAGS += \ - -I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \ + -I$(PROJECT_INCLUDE) \ $(RTEMS_LIBC_INCLUDES) else # Used for embedded bsps @@ -48,7 +44,7 @@ else GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED)) CPPFLAGS += -nostdinc \ - -I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \ + -I$(PROJECT_INCLUDE) \ -I$(GCC_INCLUDE) \ -I$(RTEMS_LIBC_DIR)/sys-include \ -I$(RTEMS_LIBC_DIR)/include @@ -72,7 +68,7 @@ GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems CC += $(GCCSPECS) CXX += $(GCCSPECS) -CPPFLAGS += $(INCLUDE_NETWORKING) +CPPFLAGS += # default location of Standard C Library ifndef LIBC_LIBC -- cgit v1.2.3