RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Removed need for use of separate include/networking directory.

Browse Source
This commit is contained in:
Joel Sherrill
1999-08-23 18:48:07 +00:00
parent 48abdc31fd
commit 72f9937b62
4 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
c/src/lib/libnetworking/include/Makefile.in
View File

@@ -62,11 +62,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@ INSTALL_CHANGE = @INSTALL_CHANGE@
mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
INSTALLDIRS = $(PROJECT_INCLUDE)/networking \ INSTALLDIRS = $(PROJECT_INCLUDE) \
$(PROJECT_INCLUDE)/networking/sys $(PROJECT_INCLUDE)/networking/machine \ $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/machine \
$(PROJECT_INCLUDE)/networking/rtems $(PROJECT_INCLUDE)/networking/vm \ $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/vm \
$(PROJECT_INCLUDE)/networking/net $(PROJECT_INCLUDE)/networking/netinet \ $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \
$(PROJECT_INCLUDE)/networking/arpa $(PROJECT_INCLUDE)/networking/nfs $(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/nfs
$(INSTALLDIRS): $(INSTALLDIRS):
@$(mkinstalldirs) $(INSTALLDIRS) @$(mkinstalldirs) $(INSTALLDIRS)
@@ -77,16 +77,16 @@ CLOBBER_ADDITIONS +=
# We only make the install point for the networking header files if needed. # We only make the install point for the networking header files if needed.
preinstall: $(INSTALLDIRS) $(SRCS) preinstall: $(INSTALLDIRS) $(SRCS)
@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
@$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys @$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
@$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems @$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems
@$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine @$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/machine
@$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm @$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/vm
@$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net @$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/net
@$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet @$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/netinet
@$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa @$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/arpa
@$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs @$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/nfs
@$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking @$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)
all: preinstall all: preinstall

30
c/src/libnetworking/include/Makefile.in
View File

@@ -62,11 +62,11 @@ include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@ INSTALL_CHANGE = @INSTALL_CHANGE@
mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
INSTALLDIRS = $(PROJECT_INCLUDE)/networking \ INSTALLDIRS = $(PROJECT_INCLUDE) \
$(PROJECT_INCLUDE)/networking/sys $(PROJECT_INCLUDE)/networking/machine \ $(PROJECT_INCLUDE)/sys $(PROJECT_INCLUDE)/machine \
$(PROJECT_INCLUDE)/networking/rtems $(PROJECT_INCLUDE)/networking/vm \ $(PROJECT_INCLUDE)/rtems $(PROJECT_INCLUDE)/vm \
$(PROJECT_INCLUDE)/networking/net $(PROJECT_INCLUDE)/networking/netinet \ $(PROJECT_INCLUDE)/net $(PROJECT_INCLUDE)/netinet \
$(PROJECT_INCLUDE)/networking/arpa $(PROJECT_INCLUDE)/networking/nfs $(PROJECT_INCLUDE)/arpa $(PROJECT_INCLUDE)/nfs
$(INSTALLDIRS): $(INSTALLDIRS):
@$(mkinstalldirs) $(INSTALLDIRS) @$(mkinstalldirs) $(INSTALLDIRS)
@@ -77,16 +77,16 @@ CLOBBER_ADDITIONS +=
# We only make the install point for the networking header files if needed. # We only make the install point for the networking header files if needed.
preinstall: $(INSTALLDIRS) $(SRCS) preinstall: $(INSTALLDIRS) $(SRCS)
@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
@$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys @$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/sys
@$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems @$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/rtems
@$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine @$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/machine
@$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm @$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/vm
@$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net @$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/net
@$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet @$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/netinet
@$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa @$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/arpa
@$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs @$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/nfs
@$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking @$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)
all: preinstall all: preinstall

10
c/src/make/compilers/gcc-target-default.cfg
View File

@@ -27,10 +27,6 @@ CFLAGS = $(CFLAGS_DEFAULT) $(XCFLAGS)
CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS) CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS)
ASFLAGS = $(CPU_ASFLAGS) $(XASFLAGS) 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_USE_GCC272),yes)
ifeq ($(RTEMS_CROSS_TARGET),no) ifeq ($(RTEMS_CROSS_TARGET),no)
@@ -40,7 +36,7 @@ endif
# Used for posix bsps # Used for posix bsps
CPPFLAGS += \ CPPFLAGS += \
-I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \ -I$(PROJECT_INCLUDE) \
$(RTEMS_LIBC_INCLUDES) $(RTEMS_LIBC_INCLUDES)
else else
# Used for embedded bsps # Used for embedded bsps
@@ -48,7 +44,7 @@ else
GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED)) GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED))
CPPFLAGS += -nostdinc \ CPPFLAGS += -nostdinc \
-I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \ -I$(PROJECT_INCLUDE) \
-I$(GCC_INCLUDE) \ -I$(GCC_INCLUDE) \
-I$(RTEMS_LIBC_DIR)/sys-include \ -I$(RTEMS_LIBC_DIR)/sys-include \
-I$(RTEMS_LIBC_DIR)/include -I$(RTEMS_LIBC_DIR)/include
@@ -72,7 +68,7 @@ GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems
CC += $(GCCSPECS) CC += $(GCCSPECS)
CXX += $(GCCSPECS) CXX += $(GCCSPECS)
CPPFLAGS += $(INCLUDE_NETWORKING) CPPFLAGS +=
# default location of Standard C Library # default location of Standard C Library
ifndef LIBC_LIBC ifndef LIBC_LIBC

10
make/compilers/gcc-target-default.cfg
View File

@@ -27,10 +27,6 @@ CFLAGS = $(CFLAGS_DEFAULT) $(XCFLAGS)
CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS) CXXFLAGS = $(CFLAGS_DEFAULT) $(XCXXFLAGS)
ASFLAGS = $(CPU_ASFLAGS) $(XASFLAGS) 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_USE_GCC272),yes)
ifeq ($(RTEMS_CROSS_TARGET),no) ifeq ($(RTEMS_CROSS_TARGET),no)
@@ -40,7 +36,7 @@ endif
# Used for posix bsps # Used for posix bsps
CPPFLAGS += \ CPPFLAGS += \
-I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \ -I$(PROJECT_INCLUDE) \
$(RTEMS_LIBC_INCLUDES) $(RTEMS_LIBC_INCLUDES)
else else
# Used for embedded bsps # Used for embedded bsps
@@ -48,7 +44,7 @@ else
GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED)) GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED))
CPPFLAGS += -nostdinc \ CPPFLAGS += -nostdinc \
-I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \ -I$(PROJECT_INCLUDE) \
-I$(GCC_INCLUDE) \ -I$(GCC_INCLUDE) \
-I$(RTEMS_LIBC_DIR)/sys-include \ -I$(RTEMS_LIBC_DIR)/sys-include \
-I$(RTEMS_LIBC_DIR)/include -I$(RTEMS_LIBC_DIR)/include
@@ -72,7 +68,7 @@ GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems
CC += $(GCCSPECS) CC += $(GCCSPECS)
CXX += $(GCCSPECS) CXX += $(GCCSPECS)
CPPFLAGS += $(INCLUDE_NETWORKING) CPPFLAGS +=
# default location of Standard C Library # default location of Standard C Library
ifndef LIBC_LIBC ifndef LIBC_LIBC