You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2009/07/11 23:47:05 UTC
svn commit: r793228 - in /apr/apr/trunk: build/NWGNUenvironment.inc
build/NWGNUmakefile xml/NWGNUmakefile
Author: fuankg
Date: Sat Jul 11 21:47:05 2009
New Revision: 793228
URL: http://svn.apache.org/viewvc?rev=793228&view=rev
Log:
NetWare build fixes: more path sanity checks; decoupled expat build.
Modified:
apr/apr/trunk/build/NWGNUenvironment.inc
apr/apr/trunk/build/NWGNUmakefile
apr/apr/trunk/xml/NWGNUmakefile
Modified: apr/apr/trunk/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUenvironment.inc?rev=793228&r1=793227&r2=793228&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUenvironment.inc (original)
+++ apr/apr/trunk/build/NWGNUenvironment.inc Sat Jul 11 21:47:05 2009
@@ -39,14 +39,35 @@
NOVELLLIBC = C:/novell/ndk/libc
endif
ifneq "$(wildcard $(NOVELLLIBC)/include/ndkvers.h)" "$(NOVELLLIBC)/include/ndkvers.h"
-$(error NOVELLLIBC does not point to a valid LIBC SDK)
+$(error NOVELLLIBC does not point to a valid Novell LIBC SDK)
endif
ifndef LDAPSDK
-LDAPSDK = C:/novell/ndk/cldapsdk
+LDAPSDK = C:/novell/ndk/cldapsdk/NetWare/libc
endif
-ifneq "$(wildcard $(LDAPSDK)/NetWare/libc/inc/ldap.h)" "$(LDAPSDK)/NetWare/libc/inc/ldap.h"
-$(error LDAPSDK does not point to a valid CLDAP SDK)
+ifneq "$(wildcard $(LDAPSDK)/inc/ldap.h)" "$(LDAPSDK)/inc/ldap.h"
+$(error LDAPSDK does not point to a valid Novell CLDAP SDK)
+endif
+
+ifdef EXPATSDK
+ifeq "$(wildcard $(EXPATSDK)/include/expat.h)" "$(EXPATSDK)/include/expat.h"
+EXPATINC = $(EXPATSRC)/include
+EXPATIMP = $(EXPATSRC)/imports/expatlbc.imp
+EXPATNLM = EXPATLBC
+else
+$(error EXPATSDK does not point to a valid EXPAT SDK)
+endif
+endif
+ifdef EXPATSRC
+ifeq "$(wildcard $(EXPATSRC)/lib/expat.h.in)" "$(EXPATSRC)/lib/expat.h.in"
+EXPATINC = $(EXPATSRC)/lib
+EXPATLIB = $(EXPATSRC)/lib/$(OBJDIR)/expat.lib
+else
+$(error EXPATSRC does not point to a valid EXPAT source tree)
+endif
+endif
+ifndef EXPATINC
+$(error neither EXPATSDK nor EXPATSRC defined - cant compile without EXPAT SDK or source tree)
endif
ifndef METROWERKS
Modified: apr/apr/trunk/build/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/NWGNUmakefile?rev=793228&r1=793227&r2=793228&view=diff
==============================================================================
--- apr/apr/trunk/build/NWGNUmakefile (original)
+++ apr/apr/trunk/build/NWGNUmakefile Sat Jul 11 21:47:05 2009
@@ -22,10 +22,7 @@
$(APR)/include/apr_ldap.h \
$(APR)/include/private/apu_config.h \
$(APR)/include/private/apu_select_dbm.h \
- $(EXPAT_SRC)/lib/config.h \
- $(EXPAT_SRC)/lib/expat.h \
$(EOLIST)
-# $(APRXML)/expat_config.h \
nlms :: $(APR)/aprlib.imp
@@ -65,18 +62,6 @@
@echo Creating $@
$(CP) $(subst /,\,$<) $(subst /,\,$@)
-#$(APRXML)/%.h: $(APRXML)/%.hnw
-# @echo Creating $@
-# $(CP) $(subst /,\,$<) $(subst /,\,$@)
-
-$(EXPAT_SRC)/lib/%.h: $(EXPAT_SRC)/lib/%.hnw
- @echo Creating $@
- $(CP) $(subst /,\,$<) $(subst /,\,$@)
-
-$(EXPAT_SRC)/lib/%.h: $(EXPAT_SRC)/lib/%.h.in
- @echo Creating $@
- $(CP) $(subst /,\,$<) $(subst /,\,$@)
-
$(APR)/include/private/apu_config.h: FORCE
#
@@ -97,9 +82,6 @@
$(CHK) $(subst /,\,$(APR))\include\private\apu_config.h $(DEL) $(subst /,\,$(APR))\include\private\apu_config.h
$(CHK) $(subst /,\,$(APR))\include\private\apu_select_dbm.h $(DEL) $(subst /,\,$(APR))\include\private\apu_select_dbm.h
$(CHK) $(subst /,\,$(APR))\aprlib.imp $(DEL) $(subst /,\,$(APR))\aprlib.imp
- $(CHK) $(subst /,\,$(EXPAT_SRC))\config.h $(DEL) $(subst /,\,$(EXPAT_SRC))\config.h
- $(CHK) $(subst /,\,$(EXPAT_SRC))\expat.h $(DEL) $(subst /,\,$(EXPAT_SRC))\expat.h
-# $(CHK) $(subst /,\,$(APRXML))\expat_config.h $(DEL) $(subst /,\,$(APRXML))\expat_config.h
#
# Include the 'tail' makefile that has targets that depend on variables defined
Modified: apr/apr/trunk/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/NWGNUmakefile?rev=793228&r1=793227&r2=793228&view=diff
==============================================================================
--- apr/apr/trunk/xml/NWGNUmakefile (original)
+++ apr/apr/trunk/xml/NWGNUmakefile Sat Jul 11 21:47:05 2009
@@ -18,16 +18,31 @@
#
# 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_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 @@
#
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