diff options
Diffstat (limited to 'build/NWGNUmakefile')
| -rw-r--r-- | build/NWGNUmakefile | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index b12384cd4..b097bcb03 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -22,10 +22,10 @@ FILES_prebuild_headers = \ $(APRUTIL)/include/apr_ldap.h \ $(APRUTIL)/include/private/apu_config.h \ $(APRUTIL)/include/private/apu_select_dbm.h \ - $(APRUTIL)/xml/expat/lib/expat.h \ - $(APRUTIL)/xml/expat/lib/config.h \ + $(APRUTIL)/xml/expat/lib/expat_config.h \ + $(APRUTIL)/uri/uri_delims.h \ $(EOLIST) - + nlms :: $(APR)/aprlib.imp $(APR)/aprlib.imp : make_nw_export.awk nw_export.i @@ -46,8 +46,8 @@ $(NLM_NAME)_cc.opt : NWGNUmakefile $(APR_WORK)\build\NWGNUenvironment.inc $(APR_ @echo -I..\include >> $@ @echo -I..\include\arch\netware >> $@ @echo -I..\include\arch\unix >> $@ - @echo -I..\..\apr-util\include >> $@ - @echo -ir $(NOVELLLIBC) >> $@ + @echo -I$(APRUTIL)\include >> $@ + @echo -ir $(NOVELLLIBC)\include >> $@ $(APR)/include/%.h: $(subst /,\,$(APR))\include\%.hnw @echo Creating $(subst /,\,$@) @@ -65,16 +65,29 @@ $(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.hnw @echo Creating $(subst /,\,$@) copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F) -$(APRUTIL)/xml/expat/lib/%.h: $(subst /,\,$(APRUTIL))\xml\expat\lib\%.h.in +ifneq "$(BUILDTOOL_AS_NLM)" "1" + +$(APRUTIL)/uri/uri_delims.h: gen_uri_delims.exe $(APRUTIL)/uri/gen_uri_delims.c @echo Creating $(subst /,\,$@) - copy $< $(subst /,\,$(APRUTIL))\xml\expat\lib\$(@F) + @$< > $@ + +%.exe: $(APRUTIL)/uri/%.c + @echo Creating $@ + @$(WIN_CC) $(WIN_CFLAGS) $< -o $@ + +else + +ifneq "$(wildcard $(APRUTIL)/uri/uri_delims.h)" "$(APRUTIL)/uri/uri_delims.h" +$(error Error: required header $(abspath $(APRUTIL)/uri/uri_delims.h) not found!) +endif + +endif # # You can use this target if all that is needed is to copy files to the # installation area # install :: nlms FORCE - clean :: $(CHK) nw_export.i $(DEL) nw_export.i @@ -85,7 +98,10 @@ clean :: $(CHK) $(subst /,\,$(APRUTIL))\include\apr_ldap.h $(DEL) $(subst /,\,$(APRUTIL))\include\apr_ldap.h $(CHK) $(subst /,\,$(APRUTIL))\include\private\apu_config.h $(DEL) $(subst /,\,$(APRUTIL))\include\private\apu_config.h $(CHK) $(subst /,\,$(APRUTIL))\include\private\apu_select_dbm.h $(DEL) $(subst /,\,$(APRUTIL))\include\private\apu_select_dbm.h - $(CHK) $(subst /,\,$(APRUTIL))\xml\expat\lib\expat.h $(DEL) $(subst /,\,$(APRUTIL))\xml\expat\lib\expat.h - $(CHK) $(subst /,\,$(APRUTIL))\xml\expat\lib\config.h $(DEL) $(subst /,\,$(APRUTIL))\xml\expat\lib\config.h + $(CHK) $(subst /,\,$(APRUTIL))\xml\expat\lib\expat_config.h $(DEL) $(subst /,\,$(APRUTIL))\xml\expat\lib\expat_config.h $(CHK) $(subst /,\,$(APR))\aprlib.imp $(DEL) $(subst /,\,$(APR))\aprlib.imp +ifneq "$(BUILDTOOL_AS_NLM)" "1" + $(CHK) $(subst /,\,$(APRUTIL))\uri\uri_delims.h $(DEL) $(subst /,\,$(APRUTIL))\uri\uri_delims.h + $(CHK) gen_uri_delims.exe $(DEL) gen_uri_delims.exe +endif |