[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
network include subdirectory
- Date: Mon, 23 Aug 1999 13:57:33 -0500
- From: joel.sherrill at OARcorp.com (Joel Sherrill)
- Subject: network include subdirectory
I think I have successfully removed the directory lib/include/networking
from the install point. I have attached the patch. I did not want to
try this before 19990820 because I was sure this would be difficult.
Turns out, it required modifying only two files and NO!!! source
code modifications.
If I did something wrong, it is not obvious. :)
The patch against 19990820 is attached.
--
Joel Sherrill, Ph.D. Director of Research & Development
joel at OARcorp.com On-Line Applications Research
Ask me about RTEMS: a free RTOS Huntsville AL 35805
Support Available (256) 722-9985
-------------- next part --------------
Index: rtems/c/src/lib/libnetworking/include/Makefile.in
diff -c rtems/c/src/lib/libnetworking/include/Makefile.in:1.10 rtems/c/src/lib/libnetworking/include/Makefile.in:1.11
*** rtems/c/src/lib/libnetworking/include/Makefile.in:1.10 Fri Jul 30 12:52:35 1999
--- rtems/c/src/lib/libnetworking/include/Makefile.in Mon Aug 23 13:48:07 1999
***************
*** 1,5 ****
#
! # $Id: Makefile.in,v 1.10 1999/07/30 17:52:35 joel Exp $
#
@SET_MAKE@
--- 1,5 ----
#
! # $Id: Makefile.in,v 1.11 1999/08/23 18:48:07 joel Exp $
#
@SET_MAKE@
***************
*** 62,72 ****
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):
@$(mkinstalldirs) $(INSTALLDIRS)
--- 62,72 ----
INSTALL_CHANGE = @INSTALL_CHANGE@
mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
! 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,92 ****
# 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
all: preinstall
--- 77,92 ----
# We only make the install point for the networking header files if needed.
preinstall: $(INSTALLDIRS) $(SRCS)
! @$(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
Index: rtems/make/compilers/gcc-target-default.cfg
diff -c rtems/make/compilers/gcc-target-default.cfg:1.24 rtems/make/compilers/gcc-target-default.cfg:1.25
*** rtems/make/compilers/gcc-target-default.cfg:1.24 Fri Aug 6 12:55:19 1999
--- rtems/make/compilers/gcc-target-default.cfg Mon Aug 23 13:48:04 1999
***************
*** 1,7 ****
#
# Shared compiler for all GNU tools configurations
#
! # $Id: gcc-target-default.cfg,v 1.24 1999/08/06 17:55:19 joel Exp $
#
##
--- 1,7 ----
#
# Shared compiler for all GNU tools configurations
#
! # $Id: gcc-target-default.cfg,v 1.25 1999/08/23 18:48:04 joel Exp $
#
##
***************
*** 27,36 ****
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)
--- 27,32 ----
***************
*** 40,46 ****
# Used for posix bsps
CPPFLAGS += \
! -I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \
$(RTEMS_LIBC_INCLUDES)
else
# Used for embedded bsps
--- 36,42 ----
# Used for posix bsps
CPPFLAGS += \
! -I$(PROJECT_INCLUDE) \
$(RTEMS_LIBC_INCLUDES)
else
# Used for embedded bsps
***************
*** 48,54 ****
GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED))
CPPFLAGS += -nostdinc \
! -I$(PROJECT_INCLUDE) $(INCLUDE_NETWORKING) \
-I$(GCC_INCLUDE) \
-I$(RTEMS_LIBC_DIR)/sys-include \
-I$(RTEMS_LIBC_DIR)/include
--- 44,50 ----
GCC_INCLUDE=$(shell $(CC) $(CPU_CFLAGS) -print-file-name=include $(GCCSED))
CPPFLAGS += -nostdinc \
! -I$(PROJECT_INCLUDE) \
-I$(GCC_INCLUDE) \
-I$(RTEMS_LIBC_DIR)/sys-include \
-I$(RTEMS_LIBC_DIR)/include
***************
*** 72,78 ****
CC += $(GCCSPECS)
CXX += $(GCCSPECS)
! CPPFLAGS += $(INCLUDE_NETWORKING)
# default location of Standard C Library
ifndef LIBC_LIBC
--- 68,74 ----
CC += $(GCCSPECS)
CXX += $(GCCSPECS)
! CPPFLAGS +=
# default location of Standard C Library
ifndef LIBC_LIBC