apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r793378 - in /apr/apr/trunk/xml: NWGNUmakefile expat_config.hnw
Date Sun, 12 Jul 2009 17:21:02 GMT
Author: fuankg
Date: Sun Jul 12 17:21:02 2009
New Revision: 793378

URL: http://svn.apache.org/viewvc?rev=793378&view=rev
Log:
enable NetWare build with recent expat source.

Added:
    apr/apr/trunk/xml/expat_config.hnw
Modified:
    apr/apr/trunk/xml/NWGNUmakefile

Modified: apr/apr/trunk/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/NWGNUmakefile?rev=793378&r1=793377&r2=793378&view=diff
==============================================================================
--- apr/apr/trunk/xml/NWGNUmakefile (original)
+++ apr/apr/trunk/xml/NWGNUmakefile Sun Jul 12 17:21:02 2009
@@ -18,12 +18,18 @@
 #
 # Make sure all needed macro's are defined
 #
+
 ifdef EXPATSRC
 
-FILES_prebuild_headers = \
-	$(EXPATSRC)/lib/config.h \
-	$(EXPATSRC)/lib/expat.h \
-	$(EOLIST)
+ifeq "$(wildcard $(EXPATSRC)/lib/expat.h.in)" "$(EXPATSRC)/lib/expat.h.in"
+EXPAT_prebuild_headers += $(EXPATSRC)/lib/expat.h
+endif
+ifeq "$(wildcard $(EXPATSRC)/lib/config.hnw)" "$(EXPATSRC)/lib/config.hnw"
+EXPAT_prebuild_headers += $(EXPATSRC)/lib/config.h
+endif
+ifeq "$(wildcard $(EXPATSRC)/expat_config.h.in)" "$(EXPATSRC)/expat_config.h.in"
+EXPAT_prebuild_headers += $(EXPATSRC)/lib/expat_config.h
+endif
 
 $(EXPATSRC)/lib/%.h: $(EXPATSRC)/lib/%.hnw
 	@echo Creating $@
@@ -33,6 +39,10 @@
 	@echo Creating $@
 	$(CP) $(subst /,\,$<) $(subst /,\,$@)
 
+$(EXPATSRC)/lib/%.h: $(CURDIR)/%.hnw
+	@echo Creating $@
+	$(CP) $(subst /,\,$<) $(subst /,\,$@)
+
 vpath %.c $(EXPATSRC)/lib
 
 endif
@@ -254,7 +264,7 @@
 # implement targets and dependancies (leave this section alone)
 #
 
-libs :: $(OBJDIR) $(FILES_prebuild_headers) $(TARGET_lib)
+libs :: $(OBJDIR) $(EXPAT_prebuild_headers) $(TARGET_lib)
 
 nlms :: libs $(TARGET_nlm)
 
@@ -264,9 +274,11 @@
 #
 install :: nlms FORCE
 
+#del_file = $(shell if exist $(subst /,\,$(1)) $(DEL) $(subst /,\,$(1)))
+
 clean ::
-	$(CHK) $(subst /,\,$(EXPATSRC))\config.h                    $(DEL) $(subst /,\,$(EXPATSRC))\config.h
-	$(CHK) $(subst /,\,$(EXPATSRC))\expat.h                     $(DEL) $(subst /,\,$(EXPATSRC))\expat.h
+#	$(foreach file,$(EXPAT_prebuild_headers),$(call del_file,$(file)))
+	$(foreach file,$(EXPAT_prebuild_headers),$(shell if exist $(subst /,\,$(file)) $(DEL) $(subst
/,\,$(file))))
 
 #
 # Any specialized rules here

Added: apr/apr/trunk/xml/expat_config.hnw
URL: http://svn.apache.org/viewvc/apr/apr/trunk/xml/expat_config.hnw?rev=793378&view=auto
==============================================================================
--- apr/apr/trunk/xml/expat_config.hnw (added)
+++ apr/apr/trunk/xml/expat_config.hnw Sun Jul 12 17:21:02 2009
@@ -0,0 +1,31 @@
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef EXPAT_CONFIG_HNW
+#define EXPAT_CONFIG_HNW
+
+#include <memory.h>
+#include <string.h>
+
+#define HAVE_MEMMOVE 1
+
+#define XML_NS 1
+#define XML_DTD 1
+#define XML_BYTE_ORDER 12
+#define XML_CONTEXT_BYTES 1024
+
+#endif /* EXPAT_CONFIG_HNW */
+



Mime
View raw message