* GSWeb.framework/GNUmakefile: Make WO_HEADER_FILES real

public headers.
        * GSWExtensions.framework/GNUmakefile: Ditto.
        * GSWeb.framework/Makefile.postamble: Simplify rules for
        installing WO_HEADER_FILES.
        * GSWExtensions.framework/Makefile.postamble: Ditto.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18825 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2004-03-10 13:05:27 +00:00
parent e59b95fcfc
commit c932c73bfd
5 changed files with 24 additions and 28 deletions

View file

@ -1,3 +1,12 @@
2004-03-10 David Ayers <d.ayers@inode.at>
* GSWeb.framework/GNUmakefile: Make WO_HEADER_FILES real
public headers.
* GSWExtensions.framework/GNUmakefile: Ditto.
* GSWeb.framework/Makefile.postamble: Simplify rules for
installing WO_HEADER_FILES.
* GSWExtensions.framework/Makefile.postamble: Ditto.
2004-03-04 David Ayers <d.ayers@inode.at>
* config.mak.in: Added EOCONTROL_LIBRARY_NAME,

View file

@ -182,7 +182,6 @@ GSWKeyValueConditional.h \
#GSWSimpleArrayDisplay.h
#GSWSimpleArrayDisplay2.h
#GSWBatchNavigationBar.h
WOExtensions_HEADER_FILES = $(GSWExtensions_HEADER_FILES)
WO_HEADER_FILES = \
WOLongResponsePage.h \
@ -190,6 +189,9 @@ WO_HEADER_FILES = \
# WOExtensions.h not needed as it gets copied explicitly
WOExtensions_HEADER_FILES = $(GSWExtensions_HEADER_FILES) \
WOExtensions.h $(WO_HEADER_FILES)
GSWExtensions_HEADER_FILES_DIR = $(HEADER_DIR)
WOExtensions_HEADER_FILES_DIR = $(HEADER_DIR)

View file

@ -43,9 +43,7 @@ endif
# before-install::
# Things to do after installing
ifneq ($(gswnames),gsw)
after-install:: WO-install-headers
endif
# after-install::
# Things to do before uninstalling
# before-uninstall::
@ -127,17 +125,11 @@ $(WOExtensions_COMPONENTS) $(WO_LOCALIZED_COMPONENTS): GSWWOReplaceScript.sed
fi ; \
done ) ;$(END_ECHO)
WO-install-headers :
$(ECHO_NOTHING)$(INSTALL_DATA) ./WOExtensions.h \
$(GNUSTEP_HEADERS)/WOExtensions/WOExtensions.h ; \
cd $(GNUSTEP_HEADERS)/WOExtensions ; \
for file in $(WO_HEADER_FILES) ; do \
$(LN_S) -f WOExtensions.h $$file; \
done;$(END_ECHO)
WO-components-clean:
$(ECHO_NOTHING)rm -rf $(WOExtensions_COMPONENTS) ; \
rm -rf $(WO_LOCALIZED_COMPONENTS) ; \
rm -f GSWWOReplaceScript.sed ;$(END_ECHO)
$(WO_HEADER_FILES): WOExtenstions.h
$(ECHO_NOTHING)$(LN_S) WOExtenstions.h $@;$(END_ECHO)

View file

@ -340,9 +340,6 @@ GSWActionURL.h \
#GSWMonitorXMLCoder.h \
#GSWMonitorXMLDecoder.h \
# The framework installed WO header files
WebObjects_HEADER_FILES = $(GSWeb_HEADER_FILES)
WO_HEADER_FILES = \
WOAdaptor.h \
WOApplication.h \
@ -365,6 +362,8 @@ WO_HEADER_FILES = \
# WebObjects.h not needed as it gets copied explicitly
# The framework installed WO header files
WebObjects_HEADER_FILES = $(GSWeb_HEADER_FILES) WebObjects.h $(WO_HEADER_FILES)
GSWeb_HEADER_FILES_DIR = $(HEADER_DIR)
WebObjects_HEADER_FILES_DIR = $(HEADER_DIR)

View file

@ -43,10 +43,10 @@ before-all:: $(GNUSTEP_TARGET_DIR)/config.h
# after-all::
# Things to do before installing
# before-install::
# before-install::
# Things to do after installing
after-install:: install-WO-headers
after-install::
@if [ ! -f $(dstDTDDir) ]; then \
$(MKDIRS) $(dstDTDDir); \
fi; \
@ -85,15 +85,9 @@ $(GNUSTEP_TARGET_DIR)/config.h: ../config.status
-mv ../config.h $(GNUSTEP_TARGET_DIR)
-touch $(GNUSTEP_TARGET_DIR)/config.h
ifneq ($(gswnames),gsw)
install-WO-headers :
$(EC)$(INSTALL_DATA) ./WebObjects/WebObjects.h \
$(INSTALL_ROOT_DIR)$(GNUSTEP_HEADERS)/WebObjects/WebObjects.h ; \
cd $(INSTALL_ROOT_DIR)$(GNUSTEP_HEADERS)/WebObjects ; \
for file in $(WO_HEADER_FILES) ; do \
$(LN_S) -f WebObjects.h $$file; \
done;$(ECHO_END)
else
install-WO-headers: ;
endif
WebObjects.h: WebObjects/WebObjects.h
$(ECHO_NOTHING)cp WebObjects/WebObjects.h .;$(END_ECHO)
$(WO_HEADER_FILES): WebObjects.h
$(ECHO_NOTHING)$(LN_S) WebObjects.h $@;$(END_ECHO)