mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
try to ensure that including objc/runtime.h always works to get the new API.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33583 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
4a5cb96bef
commit
12dee189f3
2 changed files with 24 additions and 6 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2011-07-19 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/Makefile.postamble:
|
||||
Install ObjectiveC2 compatibility headers only if that is built (which
|
||||
should be only if no 'real' objc2 library is available).
|
||||
Also generate an objc/runtime.h header to include objectiveC2/runtime.h
|
||||
so that people can just include objc/runtime.h to use the new runtime
|
||||
API irrespective of whether the API is provided by the actual runtime
|
||||
library or by the compatibility library.
|
||||
|
||||
2011-07-15 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/GNUmakefile:
|
||||
|
|
|
@ -46,15 +46,21 @@ after-all:: Info-gnustep.plist
|
|||
|
||||
# Things to do after installing
|
||||
#
|
||||
# Unfortunately the way the header files are placed in relationship
|
||||
# to the source we must install the GNU header manually
|
||||
# Ayers 2003-07-31: This statement should be reevaluated!
|
||||
ifeq ($(OBJC2RUNTIME),0)
|
||||
after-install::
|
||||
$(MKDIRS) $(GNUSTEP_HEADERS)/ObjectiveC2
|
||||
for file in $(OBJECTIVEC2_HEADERS); do \
|
||||
$(INSTALL_DATA) ../Headers/ObjectiveC2/$$file \
|
||||
$(GNUSTEP_HEADERS)/ObjectiveC2/$$file ; \
|
||||
done
|
||||
$(MKDIRS) $(GNUSTEP_HEADERS)/objc
|
||||
echo "#include <ObjectiveC2/runtime.h>" \
|
||||
> $(GNUSTEP_HEADERS)/objc/runtime.h
|
||||
endif
|
||||
# Unfortunately the way the header files are placed in relationship
|
||||
# to the source we must install the GNU header manually
|
||||
# Ayers 2003-07-31: This statement should be reevaluated!
|
||||
after-install::
|
||||
$(MKDIRS) $(GNUSTEP_HEADERS)/GNUstepBase
|
||||
for file in $(GNUSTEPBASE_HEADERS); do \
|
||||
$(INSTALL_DATA) ../Headers/GNUstepBase/$$file \
|
||||
|
@ -80,13 +86,15 @@ after-install::
|
|||
fi
|
||||
|
||||
# Things to do before uninstalling
|
||||
# before-uninstall::
|
||||
|
||||
# Things to do after uninstalling
|
||||
ifeq ($(OBJC2RUNTIME),0)
|
||||
before-uninstall::
|
||||
rm -f $(GNUSTEP_HEADERS)/objc/runtime.h; \
|
||||
for file in $(OBJECTIVEC2_HEADERS); do \
|
||||
rm -f $(GNUSTEP_HEADERS)/ObjectiveC2/$$file ; \
|
||||
done
|
||||
endif
|
||||
|
||||
before-uninstall::
|
||||
for file in $(GNUSTEPBASE_HEADERS); do \
|
||||
rm -f $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue