INTEGRATION: CWS helplinker01redux (1.28.2); FILE MERGED

2007/06/13 12:11:15 cmc 1.28.2.1: #i70155 native HelpLinker

1 files changed, 21 insertions, 83 deletions

diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk
index 50b58327927c..19ed5fe64eed 100644
--- a/xmlhelp/source/com/sun/star/help/makefile.mk
+++ b/xmlhelp/source/com/sun/star/help/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.28 $
+#   $Revision: 1.29 $
 #
-#   last change: $Author: vg $ $Date: 2007-06-08 16:42:33 $
+#   last change: $Author: hr $ $Date: 2007-06-26 12:38:50 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -35,103 +35,41 @@
 
 PRJ		= ..$/..$/..$/..$/..
 PRJNAME = xmlhelp
-PACKAGE = com$/sun$/star$/help
-TARGET  = com_sun_star_help
+TARGET  = HelpLinker
+TARGETTYPE=CUI
+LIBTARGET=no
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
 
-JARFILES 	= xt-xmlsearch.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
-EXTRAJARFILES 	= 
-
-.IF "$(SYSTEM_XT)" == "YES"
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XT_JAR)
-.ELSE
-JARFILES += xt.jar
-.ENDIF
-
-.IF "$(SYSTEM_XML_APIS)" == "YES"
-.IF "$(XCLASSPATH)" != ""
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XML_APIS_JAR)
-.ELSE
-XCLASSPATH!:=$(XML_APIS_JAR)
-.ENDIF
-.ELSE
-JARFILES += xml-apis.jar
-.ENDIF
-
-.IF "$(SYSTEM_XERCES)" == "YES"
-.IF "$(XCLASSPATH)" != ""
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XERCES_JAR)
+.IF "$(SYSTEM_LIBXSLT)" == "YES"
+CFLAGS+= $(LIBXSLT_CFLAGS)
 .ELSE
-XCLASSPATH!:=$(XERCES_JAR)
-.ENDIF
-.ELSE
-JARFILES += xercesImpl.jar
+LIBXSLTINCDIR=external$/libxslt
+CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
 .ENDIF
 
 .IF "$(SYSTEM_DB)" == "YES"
-.IF "$(XCLASSPATH)" != ""
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(DB_JAR)
-.ELSE
-XCLASSPATH!:=$(DB_JAR)
-.ENDIF
-.ELSE
-JARFILES += db.jar
+CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
 .ENDIF
 
-CLASSGENDIR		= $(OUT)$/classgen
-RDB	 		= $(SOLARBINDIR)$/types.rdb
-JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
+OBJFILES=\
+        $(OBJ)$/HelpLinker.obj \
+        $(OBJ)$/HelpCompiler.obj
 
-# --- Files --------------------------------------------------------
+EXCEPTIONSFILES=\
+        $(OBJ)$/HelpLinker.obj \
+        $(OBJ)$/HelpCompiler.obj
 
-JAVACLASSFILES = \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpCompiler.class			        \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpLinker.class  			        \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpContentIdentifier.class        \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpProvider.class                 \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpContent.class                  \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpOutputStream.class             \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpDatabases.class                \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpURLStreamHandlerFactory.class  \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpURLStreamHandler.class         \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpURLStreamHandlerWithJars.class \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpURLConnection.class            \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpURLConnectionWithJars.class    \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpURLParameter.class             \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpResultSetFactory.class         \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpDynamicResultSet.class         \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpResultSetBase.class            \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpResultSet.class                \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpResultSetForRoot.class         \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class                  \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpKeyword.class                  \
-    $(CLASSDIR)$/$(PACKAGE)$/HelpPackager.class                 \
-    $(CLASSDIR)$/$(PACKAGE)$/XSLData.class                      \
-    $(CLASSDIR)$/$(PACKAGE)$/MemoryURLConnection.class          \
-    $(CLASSDIR)$/$(PACKAGE)$/StringDbt.class 
 
-.IF "$(JDK)"=="gcj"
-JAVACLASSFILES += \
-    $(CLASSDIR)$/$(PACKAGE)$/GCJFileURLStreamHandler.class
-.ELSE
-JAVACLASSFILES += \
-    $(CLASSDIR)$/$(PACKAGE)$/FileURLStreamHandler.class
-.ENDIF
+APP1TARGET= $(TARGET)
+APP1OBJS=\
+      $(OBJ)$/HelpLinker.obj \
+      $(OBJ)$/HelpCompiler.obj
 
-JARCLASSDIRS	= com
-JARTARGET		= $(PRJNAME).jar
-JARCOMPRESS 	= TRUE
-CUSTOMMANIFESTFILE = manifest
+APP1STDLIBS+=$(SALLIB) $(BERKELEYLIB) $(ICUUCLIB) $(XSLTLIB)
 
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-.IF "$(JAVAAOTCOMPILER)" != ""
-AOTTARGET = com.sun.star.help.HelpLinker
-.INCLUDE :  aottarget.mk
-ALLTAR : $(AOTTARGETN)
-.ENDIF