gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-25 09:41:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Many updates for flattened directory structure.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8252 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-12-05 16:11:55 +00:00
parent a9377c122b
commit 656ce47951
5 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2000-12-05 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GNUmakefile:
* Source/Makefile.postamble:
* Source/Makefile.preamble:
* Tools/Makefile.preamble:
Updated for flattened directory structure.
2000-12-02 Richard Frith-Macdonald <rfm@gnu.org> 2000-12-02 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSDate.m: GSTime() added millisecond info. * Source/NSDate.m: GSTime() added millisecond info.

6
Source/GNUmakefile
View file

@ -352,9 +352,9 @@ $(HEADER_DIR)/o_array.h \
$(HEADER_DIR)/o_hash.h \ $(HEADER_DIR)/o_hash.h \
$(HEADER_DIR)/o_list.h \ $(HEADER_DIR)/o_list.h \
$(HEADER_DIR)/o_map.h \ $(HEADER_DIR)/o_map.h \
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h \ $(GNUSTEP_TARGET_DIR)/mframe.h \
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h \ $(GNUSTEP_TARGET_DIR)/config.h \
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h $(GNUSTEP_TARGET_DIR)/GSConfig.h
# The C source files to be compiled # The C source files to be compiled
libgnustep-base_C_FILES = $(GNU_CFILES) libgnustep-base_C_FILES = $(GNU_CFILES)

39
Source/Makefile.postamble
View file

@ -61,10 +61,10 @@ after-install::
$(INSTALL_DATA) ../Headers/gnustep/$$file \ $(INSTALL_DATA) ../Headers/gnustep/$$file \
$(GNUSTEP_HEADERS)/gnustep/$$file ; \ $(GNUSTEP_HEADERS)/gnustep/$$file ; \
done done
$(INSTALL_DATA) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h \ $(INSTALL_DATA) $(GNUSTEP_TARGET_DIR)/GSConfig.h \
$(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
$(INSTALL_DATA) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h \ $(INSTALL_DATA) $(GNUSTEP_TARGET_DIR)/mframe.h \
$(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
if [ "$(INSTALL_ROOT_DIR)" = "" ]; then \ if [ "$(INSTALL_ROOT_DIR)" = "" ]; then \
services=/etc/services; \ services=/etc/services; \
else \ else \
@ -109,6 +109,9 @@ after-uninstall::
after-distclean:: after-distclean::
rm -f mframe/mframe.h Foundation \ rm -f mframe/mframe.h Foundation \
NSNumber[0-9]*.m NSValue[0-9]*.m o_*_bas.m NSNumber[0-9]*.m NSValue[0-9]*.m o_*_bas.m
rm -rf $(GNUSTEP_TARGET_DIR)/config.h
rm -rf $(GNUSTEP_TARGET_DIR)/mframe.h
rm -rf $(GNUSTEP_TARGET_DIR)/GSConfig.h
rm -rf $(GNUSTEP_TARGET_CPU) rm -rf $(GNUSTEP_TARGET_CPU)
# Things to do before checking # Things to do before checking
@ -138,20 +141,20 @@ $(GNUSTEP_OBJ_DIR)/preface${OEXT}: $(HEADER_DIR)/preface.h
# #
# The config.h file is specific to a target # The config.h file is specific to a target
# #
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h: ../config.status $(GNUSTEP_TARGET_DIR)/config.h: ../config.status
$(MKDIRS) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) $(MKDIRS) $(GNUSTEP_TARGET_DIR)
-mv $(HEADER_DIR)/config.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) -mv $(HEADER_DIR)/config.h $(GNUSTEP_TARGET_DIR)
-touch $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h -touch $(GNUSTEP_TARGET_DIR)/config.h
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h: ../config.status $(GNUSTEP_TARGET_DIR)/GSConfig.h: ../config.status
$(MKDIRS) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) $(MKDIRS) $(GNUSTEP_TARGET_DIR)
-mv $(HEADER_DIR)/GSConfig.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) -mv $(HEADER_DIR)/GSConfig.h $(GNUSTEP_TARGET_DIR)
-touch $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h -touch $(GNUSTEP_TARGET_DIR)/GSConfig.h
$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h: mframe/config.status $(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status
$(MKDIRS) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) $(MKDIRS) $(GNUSTEP_TARGET_DIR)
-mv mframe/mframe.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) -mv mframe/mframe.h $(GNUSTEP_TARGET_DIR)
-touch $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h -touch $(GNUSTEP_TARGET_DIR)/mframe.h
$(HEADER_DIR)/o_%_bas.h: $(HEADER_DIR)/o_x_bas.h.in $(HEADER_DIR)/o_%_bas.h: $(HEADER_DIR)/o_x_bas.h.in
sed -e "s/@XX@/$*/g" $< > $@ sed -e "s/@XX@/$*/g" $< > $@
@ -182,7 +185,7 @@ $(GNUSTEP_OBJ_DIR)/NSConnection.o \
$(GNUSTEP_OBJ_DIR)/NSInvocation.o \ $(GNUSTEP_OBJ_DIR)/NSInvocation.o \
$(GNUSTEP_OBJ_DIR)/NSMethodSignature.o \ $(GNUSTEP_OBJ_DIR)/NSMethodSignature.o \
$(GNUSTEP_OBJ_DIR)/NSObjCRuntime.o \ $(GNUSTEP_OBJ_DIR)/NSObjCRuntime.o \
: $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h : $(GNUSTEP_TARGET_DIR)/mframe.h
# #
# Files where optimisation breaks the code! # Files where optimisation breaks the code!
@ -207,7 +210,7 @@ $(GNUSTEP_OBJ_DIR)/NSInvocation.o \
$(GNUSTEP_OBJ_DIR)/NSMethodSignature.o \ $(GNUSTEP_OBJ_DIR)/NSMethodSignature.o \
$(GNUSTEP_OBJ_DIR)/NSProcessInfo.o \ $(GNUSTEP_OBJ_DIR)/NSProcessInfo.o \
$(GNUSTEP_OBJ_DIR)/NSUnarchiver.o \ $(GNUSTEP_OBJ_DIR)/NSUnarchiver.o \
: $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h : $(GNUSTEP_TARGET_DIR)/GSConfig.h
# #
# Files that include GSIArray.h will need a rebuild if it is changed. # Files that include GSIArray.h will need a rebuild if it is changed.

4
Source/Makefile.preamble
View file

@ -50,7 +50,7 @@ ADDITIONAL_CFLAGS =
# Additional include directories the compiler should search # Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I../Headers/gnustep -I../Headers \ ADDITIONAL_INCLUDE_DIRS = -I../Headers/gnustep -I../Headers \
-I./$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) -I./$(GNUSTEP_TARGET_DIR)
# Additional LDFLAGS to pass to the linker # Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS = ADDITIONAL_LDFLAGS =
@ -73,7 +73,7 @@ endif
ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/gnustep/base \ ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/gnustep/base \
$(GNUSTEP_HEADERS)/gnustep/Foundation \ $(GNUSTEP_HEADERS)/gnustep/Foundation \
$(GNUSTEP_HEADERS)/gnustep/unicode \ $(GNUSTEP_HEADERS)/gnustep/unicode \
$(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
HEADER_DIR=$(srcdir)/../Headers/gnustep/base HEADER_DIR=$(srcdir)/../Headers/gnustep/base

2
Tools/Makefile.preamble
View file

@ -46,7 +46,7 @@ ADDITIONAL_CPPFLAGS += -DHAVE_LIBXML=$(HAVE_LIBXML)
# Additional include directories the compiler should search # Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../Headers/gnustep -I../Headers \ ADDITIONAL_INCLUDE_DIRS += -I../Headers/gnustep -I../Headers \
-I../Source/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) -I../Source/$(GNUSTEP_TARGET_DIR)
# Additional LDFLAGS to pass to the linker # Additional LDFLAGS to pass to the linker