Author: jani
Date: Mon Dec 3 21:42:03 2012
New Revision: 1416685
URL: http://svn.apache.org/viewvc?rev=1416685&view=rev
Log:
update to make po compile
Modified:
openoffice/branches/l10n/main/l10ntools/source/gCon.cxx
openoffice/branches/l10n/main/l10ntools/source/gConPo.cxx
openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx
openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConPolex.l
openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
openoffice/branches/l10n/main/l10ntools/source/gConXcslex.l
openoffice/branches/l10n/main/l10ntools/source/gLang.hxx
openoffice/branches/l10n/main/l10ntools/source/makefile.mk
Modified: openoffice/branches/l10n/main/l10ntools/source/gCon.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gCon.cxx?rev=1416685&r1=1416684&r2=1416685&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gCon.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gCon.cxx Mon Dec 3 21:42:03
2012
@@ -78,6 +78,7 @@ convert_gen& convert_gen::getConverter(c
// did the user give a .xxx with the source file ?
if (sExtension == "hrc" || sExtension == "src") return *(new convert_src
(srSourceFile, crMemory));
+ if (sExtension == "po") return *(new
convert_po(srSourceFile, crMemory));
if (sExtension == "tree") return *(new
convert_tree(srSourceFile, crMemory));
if (sExtension == "ulf") return *(new convert_ulf
(srSourceFile, crMemory));
if (sExtension == "xcu") return *(new convert_xcu
(srSourceFile, crMemory));
Modified: openoffice/branches/l10n/main/l10ntools/source/gConPo.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConPo.cxx?rev=1416685&r1=1416684&r2=1416685&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConPo.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConPo.cxx Mon Dec 3
21:42:03 2012
@@ -19,35 +19,35 @@
*
*************************************************************/
using namespace std;
-#include "gConXcu.hxx"
+#include "gConPo.hxx"
/*****************************************************************************
- ************************* G C O N X C U . C X X *************************
+ ************************** G C O N P O . C X X **************************
*****************************************************************************
- * This is the conversion for .xcu files
+ * This is the conversion for .po files
*****************************************************************************/
/***************************** G L O B A L S *****************************/
-convert_xcu_impl * convert_xcu::mcpImpl;
+convert_po_impl * convert_po::mcpImpl;
/************ I N T E R F A C E I M P L E M E N T A T I O N ************/
-convert_xcu::convert_xcu(const string& srSourceFile, l10nMem& crMemory)
+convert_po::convert_po(const string& srSourceFile, l10nMem& crMemory)
: convert_gen(srSourceFile, crMemory)
- {mcpImpl = new convert_xcu_impl(srSourceFile,
crMemory);}
-convert_xcu::~convert_xcu() {delete mcpImpl;}
-void convert_xcu::extract() {mcpImpl->extract();}
-void convert_xcu::insert() {mcpImpl->insert();}
+ {mcpImpl = new convert_po_impl(srSourceFile,
crMemory);}
+convert_po::~convert_po() {delete mcpImpl;}
+void convert_po::extract() {mcpImpl->extract();}
+void convert_po::insert() {mcpImpl->insert();}
/********************** I M P L E M E N T A T I O N **********************/
-xcu_stack_entry::xcu_stack_entry(TAG_TYPE sIsNode, string& sName)
+po_stack_entry::po_stack_entry(TAG_TYPE sIsNode, string& sName)
: mbIsNode (sIsNode),
msName (sName)
{
@@ -56,14 +56,14 @@ xcu_stack_entry::xcu_stack_entry(TAG_TYP
/********************** I M P L E M E N T A T I O N **********************/
-xcu_stack_entry::~xcu_stack_entry()
+po_stack_entry::~po_stack_entry()
{
}
/********************** I M P L E M E N T A T I O N **********************/
-convert_xcu_impl::convert_xcu_impl(const string& srSourceFile, l10nMem&
crMemory)
+convert_po_impl::convert_po_impl(const string& srSourceFile, l10nMem& crMemory)
: convert_gen (srSourceFile, crMemory)
{
}
@@ -71,14 +71,14 @@ convert_xcu_impl::convert_xcu_impl(const
/********************** I M P L E M E N T A T I O N **********************/
-convert_xcu_impl::~convert_xcu_impl()
+convert_po_impl::~convert_po_impl()
{
}
/********************** I M P L E M E N T A T I O N **********************/
-void convert_xcu_impl::extract()
+void convert_po_impl::extract()
{
// generate l10mMem
mbMergeMode = false;
@@ -90,7 +90,7 @@ void convert_xcu_impl::extract()
/********************** I M P L E M E N T A T I O N **********************/
-void convert_xcu_impl::insert()
+void convert_po_impl::insert()
{
// generate source files.
mbMergeMode = true;
Modified: openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx?rev=1416685&r1=1416684&r2=1416685&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConPo.hxx Mon Dec 3
21:42:03 2012
@@ -18,28 +18,28 @@
* under the License.
*
*************************************************************/
-#ifndef GCONXCU_HXX
-#define GCONXCU_HXX
+#ifndef GCONPO_HXX
+#define GCONPO_HXX
#include "gLang.hxx"
#include <stack>
/*****************************************************************************
- ************************* G C O N X C U . H X X *************************
+ ************************** G C O N P O . H X X **************************
*****************************************************************************
- * This is the class header for .xcu conversion
+ * This is the class header for .po conversion
*****************************************************************************/
typedef enum {TAG_COMPONENT, TAG_PROP, TAG_NODE } TAG_TYPE;
/******************** C L A S S D E F I N I T I O N ********************/
-class xcu_stack_entry
+class po_stack_entry
{
public:
- xcu_stack_entry(TAG_TYPE sIsNode, string& sName);
- ~xcu_stack_entry();
+ po_stack_entry(TAG_TYPE sIsNode, string& sName);
+ ~po_stack_entry();
TAG_TYPE mbIsNode;
string msName;
@@ -49,12 +49,12 @@ class xcu_stack_entry
/******************** C L A S S D E F I N I T I O N ********************/
-class xcu_stack_entry;
-class convert_xcu_impl : public convert_gen
+class po_stack_entry;
+class convert_po_impl : public convert_gen
{
public:
- convert_xcu_impl(const string& srSourceFile, l10nMem& crMemory);
- ~convert_xcu_impl();
+ convert_po_impl(const string& srSourceFile, l10nMem& crMemory);
+ ~convert_po_impl();
void pushKeyPart(TAG_TYPE eIsNode, string &sTag);
void popKeyPart (TAG_TYPE eIsNode, string &sTag);
@@ -64,7 +64,7 @@ class convert_xcu_impl : public convert_
void collectData(string& sCollectedText);
private:
- stack<xcu_stack_entry> mcStack;
+ stack<po_stack_entry> mcStack;
bool mbMergeMode;
bool mbCollectingData;
string msCollector;
@@ -73,6 +73,6 @@ class convert_xcu_impl : public convert_
void insert();
void runLex();
- friend class convert_xcu;
+ friend class convert_po;
};
#endif
\ No newline at end of file
Modified: openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx?rev=1416685&r1=1416684&r2=1416685&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConPoWrap.cxx Mon Dec 3
21:42:03 2012
@@ -19,12 +19,12 @@
*
*************************************************************/
using namespace std;
-#include "gConXcu.hxx"
+#include "gConPo.hxx"
/*****************************************************************************
- ********************* G C O N X C U W R A P . C X X *********************
+ ********************** G C O N P O W R A P . C X X **********************
*****************************************************************************
* This includes the c code generated by flex
*****************************************************************************/
@@ -32,25 +32,25 @@ using namespace std;
/********************** I M P L E M E N T A T I O N **********************/
-#include "gConXcu_yy.c"
+#include "gConPo_yy.c"
/********************** I M P L E M E N T A T I O N **********************/
-void convert_xcu_impl::runLex()
+void convert_po_impl::runLex()
{
- genxcu_lex();
+ genpo_lex();
}
/********************** I M P L E M E N T A T I O N **********************/
-void convert_xcu_impl::pushKeyPart(TAG_TYPE bIsNode, string& sTag)
+void convert_po_impl::pushKeyPart(TAG_TYPE bIsNode, string& sTag)
{
// remember text for merge
msCollector += sTag;
- xcu_stack_entry newTag(bIsNode, sTag);
+ po_stack_entry newTag(bIsNode, sTag);
mcStack.push(newTag);
}
@@ -58,7 +58,7 @@ void convert_xcu_impl::pushKeyPart(TAG_T
/********************** I M P L E M E N T A T I O N **********************/
-void convert_xcu_impl::popKeyPart(TAG_TYPE bIsNode, string &sTag)
+void convert_po_impl::popKeyPart(TAG_TYPE bIsNode, string &sTag)
{
// remember text for merge
msCollector += sTag;
@@ -77,7 +77,7 @@ void convert_xcu_impl::popKeyPart(TAG_TY
/********************** I M P L E M E N T A T I O N **********************/
-void convert_xcu_impl::startCollectData(string& sCollectedText)
+void convert_po_impl::startCollectData(string& sCollectedText)
{
if (mbMergeMode && msCollector.size())
writeSourceFile(msCollector);
@@ -89,7 +89,7 @@ void convert_xcu_impl::startCollectData(
/********************** I M P L E M E N T A T I O N **********************/
-void convert_xcu_impl::stopCollectData(string& sCollectedText)
+void convert_po_impl::stopCollectData(string& sCollectedText)
{
string useKey;
@@ -97,7 +97,7 @@ void convert_xcu_impl::stopCollectData(s
// locate key and extract it
while (mcStack.size())
{
- xcu_stack_entry nowEntry = mcStack.top();
+ po_stack_entry nowEntry = mcStack.top();
mcStack.pop();
useKey = useKey + nowEntry.msName;
}
@@ -126,7 +126,7 @@ void convert_xcu_impl::stopCollectData(s
/********************** I M P L E M E N T A T I O N **********************/
-void convert_xcu_impl::collectData(string& sCollectedText)
+void convert_po_impl::collectData(string& sCollectedText)
{
msCollector += sCollectedText;
if (sCollectedText == "\n")
Modified: openoffice/branches/l10n/main/l10ntools/source/gConPolex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConPolex.l?rev=1416685&r1=1416684&r2=1416685&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConPolex.l (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConPolex.l Mon Dec 3
21:42:03 2012
@@ -23,8 +23,8 @@
/*****************************************************************************
********************** L E X D E F I N I T I O N **********************
*****************************************************************************
- * lex grammar for parsing ressource source files (*.xrm files)
- * file is converted to gConXcu_yy.cxx with "flex"
+ * lex grammar for parsing ressource source files (*.po files)
+ * file is converted to gConPo_yy.cxx with "flex"
*****************************************************************************/
@@ -36,7 +36,7 @@
#define YYLMAX 64000
/* change reader function (input) to our own version */
-#define YY_INPUT(buf,result,max_size) { convert_xcu::mcpImpl->lexRead(buf,
&result, max_size); }
+#define YY_INPUT(buf,result,max_size) { convert_po::mcpImpl->lexRead(buf,
&result, max_size); }
%}
@@ -49,7 +49,7 @@
/* --- The following options are for future use (maybe) */
/* yyclass= --> subClass yyFlexLexer to allow own functions */
/* c++ --> generate C++ classes */
-%option 8bit noyywrap never-interactive prefix="genxcu_"
+%option 8bit noyywrap never-interactive prefix="genpo_"
%p 24000
%e 1200
%n 500
@@ -61,47 +61,47 @@
"<oor:component-data "[^>]*> {
string text(yytext);
- convert_xcu::mcpImpl->pushKeyPart(TAG_COMPONENT, text);
+ convert_po::mcpImpl->pushKeyPart(TAG_COMPONENT, text);
}
"</oor:component-data>" {
string text(yytext);
- convert_xcu::mcpImpl->popKeyPart(TAG_COMPONENT, text);
+ convert_po::mcpImpl->popKeyPart(TAG_COMPONENT, text);
}
"<prop oor:name=\""[^\"]*\" {
string text(yytext);
- convert_xcu::mcpImpl->pushKeyPart(TAG_PROP, text);
+ convert_po::mcpImpl->pushKeyPart(TAG_PROP, text);
}
"</prop>" {
string text(yytext);
- convert_xcu::mcpImpl->popKeyPart(TAG_PROP, text);
+ convert_po::mcpImpl->popKeyPart(TAG_PROP, text);
}
"<node oor:name=\""[^\"]*\" {
string text(yytext);
- convert_xcu::mcpImpl->pushKeyPart(TAG_NODE, text);
+ convert_po::mcpImpl->pushKeyPart(TAG_NODE, text);
}
"</node>" {
string text(yytext);
- convert_xcu::mcpImpl->popKeyPart(TAG_NODE, text);
+ convert_po::mcpImpl->popKeyPart(TAG_NODE, text);
}
"<value xml:lang=\""[^\"]*\"[^>]*">" {
string text(yytext);
- convert_xcu::mcpImpl->startCollectData(text);
+ convert_po::mcpImpl->startCollectData(text);
}
"</value>" {
string text(yytext);
- convert_xcu::mcpImpl->stopCollectData(text);
+ convert_po::mcpImpl->stopCollectData(text);
}
.|\n {
string text(yytext);
- convert_xcu::mcpImpl->collectData(text);
+ convert_po::mcpImpl->collectData(text);
}
%%
Modified: openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx?rev=1416685&r1=1416684&r2=1416685&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConSrcWrap.cxx Mon Dec 3
21:42:03 2012
@@ -44,13 +44,13 @@ void convert_src_impl::addTokenToSet(LEX
{
//JIX
#if 0
- tokenStorage newToken;
-
- newToken.mnToken = nToken;
- newToken.msYYtext = srYYtext;
-
- mcTokenSet.push_back(newToken);
-#endif
+ tokenStorage newToken;
+
+ newToken.mnToken = nToken;
+ newToken.msYYtext = srYYtext;
+
+ mcTokenSet.push_back(newToken);
+#endif
}
@@ -58,39 +58,39 @@ void convert_src_impl::addTokenToSet(LEX
/********************** I M P L E M E N T A T I O N **********************/
void convert_src_impl::addCommentToSet(LEX_TOKENS nToken, string srYYtext)
{
- char buf[2];
- bool check_comment_terminate;
-
-
- // loop and collect whole comment
- for (check_comment_terminate = false, buf[1] = '\0';;)
- {
- buf[0] = yyinput();
-
- // end of file ?
- if (!buf[0])
- break;
-
- // remember byte
- srYYtext.append(buf);
-
- // did we receive ´*' ?
- if (check_comment_terminate)
- {
- // end of comment ?
- if (buf[0] == '/')
- break;
-
- // it was not the end of comment
- check_comment_terminate = false;
- }
- else
- // Start on end of comment ?
- if (buf[0] == '*')
- check_comment_terminate = true;
- }
-
- addTokenToSet(COMMEND, srYYtext);
+ char buf[2];
+ bool check_comment_terminate;
+
+
+ // loop and collect whole comment
+ for (check_comment_terminate = false, buf[1] = '\0';;)
+ {
+ buf[0] = yyinput();
+
+ // end of file ?
+ if (!buf[0])
+ break;
+
+ // remember byte
+ srYYtext.append(buf);
+
+ // did we receive ´*' ?
+ if (check_comment_terminate)
+ {
+ // end of comment ?
+ if (buf[0] == '/')
+ break;
+
+ // it was not the end of comment
+ check_comment_terminate = false;
+ }
+ else
+ // Start on end of comment ?
+ if (buf[0] == '*')
+ check_comment_terminate = true;
+ }
+
+ addTokenToSet(COMMEND, srYYtext);
}
Modified: openoffice/branches/l10n/main/l10ntools/source/gConXcslex.l
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gConXcslex.l?rev=1416685&r1=1416684&r2=1416685&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gConXcslex.l (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gConXcslex.l Mon Dec 3
21:42:03 2012
@@ -59,14 +59,43 @@
/******************* R U L E S D E F I N I T I O N S *******************/
%%
-"<p"[^>]*> |
-"<h"[0-9][^>]*> {
+"<oor:component-data "[^>]*> {
+ string text(yytext);
+// convert_xcs::mcpImpl->pushKeyPart(TAG_COMPONENT, text);
+}
+
+
+"</oor:component-data>" {
+ string text(yytext);
+// convert_xcs::mcpImpl->popKeyPart(TAG_COMPONENT, text);
+}
+
+"<prop oor:name=\""[^\"]*\" {
+ string text(yytext);
+// convert_xcu::mcpImpl->pushKeyPart(TAG_PROP, text);
+}
+
+"</prop>" {
+ string text(yytext);
+// convert_xcs::mcpImpl->popKeyPart(TAG_PROP, text);
+}
+
+"<node oor:name=\""[^\"]*\" {
+ string text(yytext);
+// convert_xcs::mcpImpl->pushKeyPart(TAG_NODE, text);
+}
+
+"</node>" {
+ string text(yytext);
+// convert_xcs::mcpImpl->popKeyPart(TAG_NODE, text);
+}
+
+"<value xml:lang=\""[^\"]*\"[^>]*">" {
string text(yytext);
convert_xcs::mcpImpl->startCollectData(text);
}
-"</p>" |
-"</h"[0-9]> {
+"</value>" {
string text(yytext);
convert_xcs::mcpImpl->stopCollectData(text);
}
@@ -75,6 +104,4 @@
string text(yytext);
convert_xcs::mcpImpl->collectData(text);
}
-
-
%%
Modified: openoffice/branches/l10n/main/l10ntools/source/gLang.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/gLang.hxx?rev=1416685&r1=1416684&r2=1416685&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/gLang.hxx (original)
+++ openoffice/branches/l10n/main/l10ntools/source/gLang.hxx Mon Dec 3
21:42:03 2012
@@ -108,6 +108,25 @@ class convert_gen
/******************** C L A S S D E F I N I T I O N ********************/
+class convert_po_impl;
+class convert_po : public convert_gen
+{
+ public:
+ static convert_po_impl *mcpImpl;
+
+
+ convert_po(const string& srSourceFile, l10nMem& crMemory);
+ ~convert_po();
+
+ void extract();
+ void insert();
+
+ private:
+};
+
+
+
+/******************** C L A S S D E F I N I T I O N ********************/
class convert_src_impl;
class convert_src : public convert_gen
{
Modified: openoffice/branches/l10n/main/l10ntools/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/l10n/main/l10ntools/source/makefile.mk?rev=1416685&r1=1416684&r2=1416685&view=diff
==============================================================================
--- openoffice/branches/l10n/main/l10ntools/source/makefile.mk (original)
+++ openoffice/branches/l10n/main/l10ntools/source/makefile.mk Mon Dec 3
21:42:03 2012
@@ -26,7 +26,7 @@ PRJ=..
INCPRE=$(MISC)
PRJNAME=l10ntools
-TARGET=transex
+TARGET=genLang
TARGETTYPE=CUI
LIBTARGET=no
# --- Settings -----------------------------------------------------
@@ -43,133 +43,10 @@ CFLAGS+=-DSYSTEM_EXPAT
# --- Files --------------------------------------------------------
-OBJFILES= \
- $(OBJ)$/export.obj \
- $(OBJ)$/export2.obj \
- $(OBJ)$/merge.obj \
- $(OBJ)$/srciter.obj \
- $(OBJ)$/utf8conv.obj \
- $(OBJ)$/xmlparse.obj \
- $(OBJ)$/helpmerge.obj \
- $(OBJ)$/helpex.obj \
- $(OBJ)$/file.obj \
- $(OBJ)$/directory.obj
-
-
-LIB1TARGET= $(LB)$/$(TARGET).lib
-LIB1ARCHIV= $(LB)$/libtransex.a
-#LIB1FILES= $(LB)$/transex3.lib
-LIB1OBJFILES= $(OBJ)$/export.obj \
- $(OBJ)$/export2.obj \
- $(OBJ)$/merge.obj \
- $(OBJ)$/srciter.obj \
- $(OBJ)$/file.obj \
- $(OBJ)$/directory.obj \
- $(OBJ)$/utf8conv.obj
-
-
-APP1VERSIONMAP=exports.map
-
-# extractor and merger for *.src and *.hrc
-APP1TARGET= transex3
-#APP1OBJS= $(OBJ)$/src_yy.obj
-APP1OBJS= $(OBJ)$/src_yy_wrapper.obj
-
-APP1STDLIBS+= \
- $(TOOLSLIB) \
- $(VOSLIB) \
- $(SALLIB)
-
-.IF "$(OS)"=="MACOSX"
-# static libs at end for OS X
-.ENDIF
-
-APP1LIBS+= $(LB)$/$(TARGET).lib
-APP1DEPN= $(OBJ)$/src_yy_wrapper.obj $(LB)$/$(TARGET).lib
-
-APP2TARGET= helpex
-APP2OBJS= $(OBJ)$/helpmerge.obj $(OBJ)$/xmlparse.obj $(OBJ)$/export2.obj
$(OBJ)$/utf8conv.obj $(OBJ)$/merge.obj $(OBJ)$/helpex.obj
-APP2RPATH= NONE
-
-.IF "$(OS)"!="MACOSX"
-.ENDIF
-
-APP2STDLIBS+=$(SALLIB) $(EXPATASCII3RDLIB) $(TOOLSLIB) $(VOSLIB)
-
-.IF "$(OS)"=="MACOSX"
-# static libs at end for OS X
-.ENDIF
-
-# extractor and merger for *.lng and *.lng
-APP3TARGET= ulfex
-APP3OBJS= $(OBJ)$/lngmerge.obj $(OBJ)$/merge.obj $(OBJ)$/export2.obj
$(OBJ)$/lngex.obj $(OBJ)$/utf8conv.obj
-APP3RPATH= NONE
-
-.IF "$(OS)"!="MACOSX"
-#APP3STDLIBS+= $(BTSTRPLIB)
-.ENDIF
-APP3STDLIBS+= \
- $(TOOLSLIB) \
- $(VOSLIB) \
- $(SALLIB)
-.IF "$(OS)"=="MACOSX"
-# static libs at end for OS X
-.ENDIF
-
-# encoding converter for *.gsi
-APP4TARGET= gsiconv
-APP4OBJS= $(OBJ)$/utf8conv.obj $(OBJ)$/gsiconv.obj
-APP4STDLIBS+= \
- $(TOOLSLIB) \
- $(VOSLIB) \
- $(SALLIB)
-
-# tag checker for *.gsi
-APP5TARGET= gsicheck
-APP5OBJS= $(OBJ)$/gsicheck.obj $(OBJ)$/tagtest.obj
-APP5STDLIBS+= \
- $(TOOLSLIB) \
- $(VOSLIB) \
- $(SALLIB)
-
-# extractor and merger for *.cfg
-APP6TARGET= cfgex
-APP6OBJS= $(OBJ)$/cfgmerge.obj $(OBJ)$/cfg_yy_wrapper.obj $(OBJ)$/merge.obj
$(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj
-
-.IF "$(OS)"!="MACOSX"
-#APP6STDLIBS+= $(BTSTRPLIB)
-.ENDIF
-
-APP6STDLIBS+= \
- $(TOOLSLIB) \
- $(VOSLIB) \
- $(SALLIB)
-
-.IF "$(OS)"=="MACOSX"
-# static libs at end for OS X
-.ENDIF
-
-# extractor and merger for *.xrm
-APP7TARGET= xrmex
-APP7OBJS= $(OBJ)$/xrmmerge.obj $(OBJ)$/xrm_yy_wrapper.obj $(OBJ)$/merge.obj
$(OBJ)$/export2.obj $(OBJ)$/utf8conv.obj
-APP7RPATH= NONE
-
-.IF "$(OS)"!="MACOSX"
-.ENDIF
-
-APP7STDLIBS+= \
- $(TOOLSLIB) \
- $(VOSLIB) \
- $(SALLIB)
-
-.IF "$(OS)"=="MACOSX"
-# static libs at end for OS X
-.ENDIF
-
# localizer for new l10n framework
#
-APP8TARGET= genLang
-APP8OBJS= $(OBJ)$/gLang.obj \
+APP1TARGET= genLang
+APP1OBJS= $(OBJ)$/gLang.obj \
$(OBJ)$/gL10nMem.obj \
$(OBJ)$/gHandler.obj \
$(OBJ)$/gConProp.obj \
@@ -189,26 +66,12 @@ APP8OBJS= $(OBJ)$/gLang.obj \
$(OBJ)$/gConXcuWrap.obj \
$(OBJ)$/gConXrmWrap.obj \
$(OBJ)$/gConXhpWrap.obj
-APP8RPATH= NONE
-APP8STDLIBS+= $(TOOLSLIB) \
+APP1RPATH= NONE
+APP1STDLIBS+= $(TOOLSLIB) \
$(VOSLIB) \
$(SALLIB)
-# localizer for l10n framework
-APP9TARGET= localize_sl
-EXCEPTIONSFILES= \
- $(OBJ)$/localize.obj
-APP9OBJS= $(OBJ)$/localize.obj $(OBJ)$/utf8conv.obj $(OBJ)$/srciter.obj
$(OBJ)$/export2.obj $(OBJ)$/file.obj $(OBJ)$/directory.obj
$(OBJ)$/treeconfig.obj $(OBJ)$/inireader.obj
-
-APP9STDLIBS+= \
- $(TOOLSLIB) \
- $(VOSLIB) \
- $(ICUINLIB) \
- $(ICUUCLIB) \
- $(STLPORTLIB) \
- $(SALLIB)
-
-DEPOBJFILES=$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS)
$(APP6OBJS) $(APP7OBJS) $(APP8OBJS) $(APP9OBJS)
+DEPOBJFILES=$(APP1OBJS)
# --- Targets ------------------------------------------------------
@@ -219,9 +82,6 @@ $(MISC)$/%_yy.c : %lex.l
# Helper to suppress warnings in lex generated c code, see #i57362#
-$(OBJ)$/src_yy_wrapper.obj: $(MISC)$/src_yy.c
-$(OBJ)$/cfg_yy_wrapper.obj: $(MISC)$/cfg_yy.c
-$(OBJ)$/xrm_yy_wrapper.obj: $(MISC)$/xrm_yy.c
$(OBJ)$/gConPoWrap.obj: $(MISC)$/gConPo_yy.c
$(OBJ)$/gConSrcWrap.obj: $(MISC)$/gConSrc_yy.c
$(OBJ)$/gConXcuWrap.obj: $(MISC)$/gConXcu_yy.c
