diff options
| author | Guenter Knauf <fuankg@apache.org> | 2009-07-11 21:47:05 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2009-07-11 21:47:05 +0000 |
| commit | c06f453ca740f95d7a5bb32409166a087e49cf12 (patch) | |
| tree | 5d24a4ef9afbb6339ccf0524d4727a798b4766b2 /xml | |
| parent | 675d043c6335bab6ae291eca31e99c50eed1f3fb (diff) | |
| download | apr-c06f453ca740f95d7a5bb32409166a087e49cf12.tar.gz | |
NetWare build fixes: more path sanity checks; decoupled expat build.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@793228 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/NWGNUmakefile | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/xml/NWGNUmakefile b/xml/NWGNUmakefile index b476e2f4c..321d2e4b2 100644 --- a/xml/NWGNUmakefile +++ b/xml/NWGNUmakefile @@ -18,16 +18,31 @@ include $(APR_WORK)/build/NWGNUhead.inc # # Make sure all needed macro's are defined # -V_PATH = \ - $(EXPAT_SRC)/lib \ +ifdef EXPATSRC + +FILES_prebuild_headers = \ + $(EXPATSRC)/lib/config.h \ + $(EXPATSRC)/lib/expat.h \ $(EOLIST) +$(EXPATSRC)/lib/%.h: $(EXPATSRC)/lib/%.hnw + @echo Creating $@ + $(CP) $(subst /,\,$<) $(subst /,\,$@) + +$(EXPATSRC)/lib/%.h: $(EXPATSRC)/lib/%.h.in + @echo Creating $@ + $(CP) $(subst /,\,$<) $(subst /,\,$@) + +vpath %.c $(EXPATSRC)/lib + +endif + # # These directories will be at the beginning of the include list, followed by # INCDIRS # XINCDIRS += \ - $(V_PATH) \ + $(EXPATINC) \ $(APR)/include \ $(APR)/include/private \ $(APR)/include/arch/NetWare \ @@ -225,16 +240,21 @@ FILES_nlm_exports = \ # FILES_lib_objs = \ $(OBJDIR)/apr_xml.o \ + $(EOLIST) + +ifdef EXPATSRC +FILES_lib_objs += \ $(OBJDIR)/xmlparse.o \ $(OBJDIR)/xmlrole.o \ $(OBJDIR)/xmltok.o \ $(EOLIST) +endif # # implement targets and dependancies (leave this section alone) # -libs :: $(OBJDIR) $(TARGET_lib) +libs :: $(OBJDIR) $(FILES_prebuild_headers) $(TARGET_lib) nlms :: libs $(TARGET_nlm) @@ -244,12 +264,14 @@ nlms :: libs $(TARGET_nlm) # install :: nlms FORCE +clean :: + $(CHK) $(subst /,\,$(EXPATSRC))\config.h $(DEL) $(subst /,\,$(EXPATSRC))\config.h + $(CHK) $(subst /,\,$(EXPATSRC))\expat.h $(DEL) $(subst /,\,$(EXPATSRC))\expat.h + # # Any specialized rules here # -vpath %.c $(V_PATH) - # # Include the 'tail' makefile that has targets that depend on variables defined # in this makefile |