INTEGRATION: CWS helpcontentbeta (1.6.2); FILE MERGED

2004/11/11 13:40:31 fpe 1.6.2.4: updated makefiles
2004/10/28 10:48:06 fpe 1.6.2.3: updated makefiles
2004/10/15 09:01:19 fpe 1.6.2.2: new makefiles
2004/09/16 12:26:47 fpe 1.6.2.1: Regular Update

1 files changed, 137 insertions, 30 deletions

diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index 4dedd4eb47..aa4ebdd4f6 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -3,9 +3,9 @@
 #*    $Workfile:$
 #*
 #*    Creation date     KR 28.06.99
-#*    last change       $Author: hr $ $Date: 2004-11-09 11:48:16 $
+#*    last change       $Author: rt $ $Date: 2004-11-27 00:25:57 $
 #*
-#*    $Revision: 1.7 $
+#*    $Revision: 1.8 $
 #*
 #*    $Logfile:$
 #*
@@ -15,11 +15,11 @@
 
 # edit to match directory level 
 PRJ		= ..$/..
-# same for all makefiles in "help2"
-PRJNAME = help2
+# same for all makefiles in "helpcontent2"
+PRJNAME = helpcontent2
 # uniqe name (module wide);
-# using a modified forme of package should do here
-TARGET  = smath_util
+# using a modified form of package should do here
+TARGET  = util
 
 # --- Settings -----------------------------------------------------
 
@@ -29,7 +29,7 @@ TARGET  = smath_util
 .IF "$(SOLAR_JAVA)"!=""
 common_build_zip:=
 zip1generatedlangs=TRUE
-ZIP1TARGET=smath_xhp
+ZIP1TARGET=xhp_smath
 ZIP1FLAGS= -u -r
 ZIP1DIR=$(MISC)$/$(LANGDIR)
 ZIP1LIST=$(LANGDIR)$/text$/smath$/* -x "*.dphh*" -x "*.hzip"
@@ -40,13 +40,13 @@ LINKNAME=smath
 LINKADDEDFILES= \
    -add smath.cfg $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \
    -add smath.tree $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.tree \
-   -add smath.jar  $(BIN)$/smath_xhp_LANGUAGE.zip
+   -add smath.jar  $(BIN)$/xhp_smath_LANGUAGE.zip
 
 
 LINKADDEDDEPS= \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.cfg \
    $(PRJ)$/source$/auxiliary$/LANGUAGE$/smath.tree \
-   $(BIN)$/smath_xhp_LANGUAGE.zip
+   $(BIN)$/xhp_smath_LANGUAGE.zip
 
 
 LINKLINKFILES= \
@@ -382,6 +382,8 @@ LINKLINKFILES= \
    text$/shared$/01$/06010000.hzip \
    text$/shared$/01$/06010101.hzip \
    text$/shared$/01$/06010500.hzip \
+   text$/shared$/01$/06010600.hzip \
+   text$/shared$/01$/06010601.hzip \
    text$/shared$/01$/06020000.hzip \
    text$/shared$/01$/06030000.hzip \
    text$/shared$/01$/06040000.hzip \
@@ -395,19 +397,19 @@ LINKLINKFILES= \
    text$/shared$/01$/06050100.hzip \
    text$/shared$/01$/06050200.hzip \
    text$/shared$/01$/06050300.hzip \
-   text$/shared$/01$/06050400.hzip \
    text$/shared$/01$/06050500.hzip \
    text$/shared$/01$/06050600.hzip \
    text$/shared$/01$/06130000.hzip \
    text$/shared$/01$/06130001.hzip \
    text$/shared$/01$/06130010.hzip \
    text$/shared$/01$/06130100.hzip \
+   text$/shared$/01$/06130200.hzip \
    text$/shared$/01$/06130500.hzip \
    text$/shared$/01$/06140000.hzip \
+   text$/shared$/01$/06140100.hzip \
    text$/shared$/01$/06140101.hzip \
    text$/shared$/01$/06140102.hzip \
    text$/shared$/01$/06140200.hzip \
-   text$/shared$/01$/06140300.hzip \
    text$/shared$/01$/06140400.hzip \
    text$/shared$/01$/06140401.hzip \
    text$/shared$/01$/06140402.hzip \
@@ -426,10 +428,12 @@ LINKLINKFILES= \
    text$/shared$/01$/07080000.hzip \
    text$/shared$/01$/08060100.hzip \
    text$/shared$/01$/about_meta_tags.hzip \
+   text$/shared$/01$/digitalsignatures.hzip \
    text$/shared$/01$/gallery.hzip \
    text$/shared$/01$/gallery_files.hzip \
    text$/shared$/01$/grid.hzip \
    text$/shared$/01$/guides.hzip \
+   text$/shared$/01$/liststyles.hzip \
    text$/shared$/01$/mediaplayer.hzip \
    text$/shared$/01$/moviesound.hzip \
    text$/shared$/01$/packagemanager.hzip \
@@ -437,6 +441,13 @@ LINKLINKFILES= \
    text$/shared$/01$/password_main.hzip \
    text$/shared$/01$/ref_pdf_export.hzip \
    text$/shared$/01$/ref_pdf_send_as.hzip \
+   text$/shared$/01$/securitywarning.hzip \
+   text$/shared$/01$/selectcertificate.hzip \
+   text$/shared$/01$/xformsdata.hzip \
+   text$/shared$/01$/xformsdataadd.hzip \
+   text$/shared$/01$/xformsdataaddcon.hzip \
+   text$/shared$/01$/xformsdatachange.hzip \
+   text$/shared$/01$/xformsdataname.hzip \
    text$/shared$/02$/01110000.hzip \
    text$/shared$/02$/01140000.hzip \
    text$/shared$/02$/01170000.hzip \
@@ -446,6 +457,7 @@ LINKLINKFILES= \
    text$/shared$/02$/01170004.hzip \
    text$/shared$/02$/01170100.hzip \
    text$/shared$/02$/01170101.hzip \
+   text$/shared$/02$/01170102.hzip \
    text$/shared$/02$/01170103.hzip \
    text$/shared$/02$/01170200.hzip \
    text$/shared$/02$/01170201.hzip \
@@ -574,7 +586,14 @@ LINKLINKFILES= \
    text$/shared$/02$/24080000.hzip \
    text$/shared$/02$/24090000.hzip \
    text$/shared$/02$/24100000.hzip \
+   text$/shared$/02$/basicshapes.hzip \
+   text$/shared$/02$/blockarrows.hzip \
+   text$/shared$/02$/callouts.hzip \
+   text$/shared$/02$/flowcharts.hzip \
+   text$/shared$/02$/fontwork.hzip \
    text$/shared$/02$/paintbrush.hzip \
+   text$/shared$/02$/stars.hzip \
+   text$/shared$/02$/symbolshapes.hzip \
    text$/shared$/04$/01010000.hzip \
    text$/shared$/04$/01020000.hzip \
    text$/shared$/05$/00000001.hzip \
@@ -588,6 +607,7 @@ LINKLINKFILES= \
    text$/shared$/05$/00000160.hzip \
    text$/shared$/05$/err_html.hzip \
    text$/shared$/07$/09000000.hzip \
+   text$/shared$/3dsettings_toolbar.hzip \
    text$/shared$/autokorr$/01000000.hzip \
    text$/shared$/autokorr$/02000000.hzip \
    text$/shared$/autokorr$/03000000.hzip \
@@ -602,23 +622,41 @@ LINKLINKFILES= \
    text$/shared$/autokorr$/12000000.hzip \
    text$/shared$/autokorr$/13000000.hzip \
    text$/shared$/autopi$/01000000.hzip \
-   text$/shared$/autopi$/01020600.hzip \
-   text$/shared$/autopi$/01020700.hzip \
-   text$/shared$/autopi$/01020800.hzip \
-   text$/shared$/autopi$/01030000.hzip \
-   text$/shared$/autopi$/01030100.hzip \
-   text$/shared$/autopi$/01030200.hzip \
-   text$/shared$/autopi$/01030300.hzip \
-   text$/shared$/autopi$/01030400.hzip \
-   text$/shared$/autopi$/01030500.hzip \
+   text$/shared$/autopi$/01010000.hzip \
+   text$/shared$/autopi$/01010100.hzip \
+   text$/shared$/autopi$/01010200.hzip \
+   text$/shared$/autopi$/01010300.hzip \
+   text$/shared$/autopi$/01010400.hzip \
+   text$/shared$/autopi$/01010500.hzip \
+   text$/shared$/autopi$/01010600.hzip \
+   text$/shared$/autopi$/01020000.hzip \
+   text$/shared$/autopi$/01020100.hzip \
+   text$/shared$/autopi$/01020200.hzip \
+   text$/shared$/autopi$/01020300.hzip \
+   text$/shared$/autopi$/01020400.hzip \
+   text$/shared$/autopi$/01020500.hzip \
+   text$/shared$/autopi$/01040000.hzip \
+   text$/shared$/autopi$/01040100.hzip \
+   text$/shared$/autopi$/01040200.hzip \
+   text$/shared$/autopi$/01040300.hzip \
+   text$/shared$/autopi$/01040400.hzip \
+   text$/shared$/autopi$/01040500.hzip \
+   text$/shared$/autopi$/01040600.hzip \
    text$/shared$/autopi$/01050000.hzip \
    text$/shared$/autopi$/01050100.hzip \
    text$/shared$/autopi$/01050200.hzip \
    text$/shared$/autopi$/01050300.hzip \
    text$/shared$/autopi$/01050400.hzip \
    text$/shared$/autopi$/01050500.hzip \
-   text$/shared$/autopi$/01060000.hzip \
    text$/shared$/autopi$/01090000.hzip \
+   text$/shared$/autopi$/01090100.hzip \
+   text$/shared$/autopi$/01090200.hzip \
+   text$/shared$/autopi$/01090210.hzip \
+   text$/shared$/autopi$/01090220.hzip \
+   text$/shared$/autopi$/01090300.hzip \
+   text$/shared$/autopi$/01090400.hzip \
+   text$/shared$/autopi$/01090500.hzip \
+   text$/shared$/autopi$/01090600.hzip \
    text$/shared$/autopi$/01100000.hzip \
    text$/shared$/autopi$/01100100.hzip \
    text$/shared$/autopi$/01100150.hzip \
@@ -646,8 +684,21 @@ LINKLINKFILES= \
    text$/shared$/autopi$/01170000.hzip \
    text$/shared$/autopi$/01170200.hzip \
    text$/shared$/autopi$/01170300.hzip \
+   text$/shared$/autopi$/01170400.hzip \
    text$/shared$/autopi$/01170500.hzip \
+   text$/shared$/autopi$/purchase.hzip \
+   text$/shared$/autopi$/startup.hzip \
    text$/shared$/autopi$/webwizard00.hzip \
+   text$/shared$/autopi$/webwizard01.hzip \
+   text$/shared$/autopi$/webwizard02.hzip \
+   text$/shared$/autopi$/webwizard03.hzip \
+   text$/shared$/autopi$/webwizard04.hzip \
+   text$/shared$/autopi$/webwizard05.hzip \
+   text$/shared$/autopi$/webwizard05bi.hzip \
+   text$/shared$/autopi$/webwizard05is.hzip \
+   text$/shared$/autopi$/webwizard06.hzip \
+   text$/shared$/autopi$/webwizard07.hzip \
+   text$/shared$/autopi$/webwizard07fc.hzip \
    text$/shared$/explorer$/database$/02000000.hzip \
    text$/shared$/explorer$/database$/02000002.hzip \
    text$/shared$/explorer$/database$/02010100.hzip \
@@ -698,11 +749,47 @@ LINKLINKFILES= \
    text$/shared$/explorer$/database$/dabaadvprop.hzip \
    text$/shared$/explorer$/database$/dabaadvpropdat.hzip \
    text$/shared$/explorer$/database$/dabaadvpropgen.hzip \
+   text$/shared$/explorer$/database$/dabadoc.hzip \
    text$/shared$/explorer$/database$/dabaprop.hzip \
    text$/shared$/explorer$/database$/dabapropadd.hzip \
    text$/shared$/explorer$/database$/dabapropcon.hzip \
    text$/shared$/explorer$/database$/dabapropgen.hzip \
+   text$/shared$/explorer$/database$/dabawiz00.hzip \
+   text$/shared$/explorer$/database$/dabawiz01.hzip \
+   text$/shared$/explorer$/database$/dabawiz02.hzip \
+   text$/shared$/explorer$/database$/dabawiz02access.hzip \
+   text$/shared$/explorer$/database$/dabawiz02adabas.hzip \
+   text$/shared$/explorer$/database$/dabawiz02ado.hzip \
+   text$/shared$/explorer$/database$/dabawiz02jdbc.hzip \
+   text$/shared$/explorer$/database$/dabawiz02ldap.hzip \
+   text$/shared$/explorer$/database$/dabawiz02mysql.hzip \
+   text$/shared$/explorer$/database$/dabawiz02odbc.hzip \
+   text$/shared$/explorer$/database$/dabawiz02oracle.hzip \
+   text$/shared$/explorer$/database$/dabawiz02spreadsheet.hzip \
+   text$/shared$/explorer$/database$/dabawiz02text.hzip \
+   text$/shared$/explorer$/database$/dabawiz03auth.hzip \
+   text$/shared$/explorer$/database$/main.hzip \
+   text$/shared$/explorer$/database$/menubar.hzip \
    text$/shared$/explorer$/database$/menuedit.hzip \
+   text$/shared$/explorer$/database$/menufile.hzip \
+   text$/shared$/explorer$/database$/menuinsert.hzip \
+   text$/shared$/explorer$/database$/menutools.hzip \
+   text$/shared$/explorer$/database$/menuview.hzip \
+   text$/shared$/explorer$/database$/querywizard00.hzip \
+   text$/shared$/explorer$/database$/querywizard01.hzip \
+   text$/shared$/explorer$/database$/querywizard02.hzip \
+   text$/shared$/explorer$/database$/querywizard03.hzip \
+   text$/shared$/explorer$/database$/querywizard04.hzip \
+   text$/shared$/explorer$/database$/querywizard05.hzip \
+   text$/shared$/explorer$/database$/querywizard06.hzip \
+   text$/shared$/explorer$/database$/querywizard07.hzip \
+   text$/shared$/explorer$/database$/querywizard08.hzip \
+   text$/shared$/explorer$/database$/tablewizard00.hzip \
+   text$/shared$/explorer$/database$/tablewizard01.hzip \
+   text$/shared$/explorer$/database$/tablewizard02.hzip \
+   text$/shared$/explorer$/database$/tablewizard03.hzip \
+   text$/shared$/explorer$/database$/tablewizard04.hzip \
+   text$/shared$/fontwork_toolbar.hzip \
    text$/shared$/guide$/aaa_start.hzip \
    text$/shared$/guide$/accessibility.hzip \
    text$/shared$/guide$/active_help_on_off.hzip \
@@ -731,11 +818,18 @@ LINKLINKFILES= \
    text$/shared$/guide$/data_addressbook.hzip \
    text$/shared$/guide$/data_dbase2office.hzip \
    text$/shared$/guide$/data_enter_sql.hzip \
+   text$/shared$/guide$/data_forms.hzip \
+   text$/shared$/guide$/data_new.hzip \
    text$/shared$/guide$/data_office2calc.hzip \
+   text$/shared$/guide$/data_queries.hzip \
+   text$/shared$/guide$/data_register.hzip \
    text$/shared$/guide$/data_report.hzip \
+   text$/shared$/guide$/data_reports.hzip \
    text$/shared$/guide$/data_search.hzip \
    text$/shared$/guide$/data_search2.hzip \
    text$/shared$/guide$/data_tabledefine.hzip \
+   text$/shared$/guide$/data_tables.hzip \
+   text$/shared$/guide$/data_view.hzip \
    text$/shared$/guide$/database_main.hzip \
    text$/shared$/guide$/doc_autosave.hzip \
    text$/shared$/guide$/doc_open.hzip \
@@ -751,10 +845,12 @@ LINKLINKFILES= \
    text$/shared$/guide$/error_report.hzip \
    text$/shared$/guide$/export_ms.hzip \
    text$/shared$/guide$/fax.hzip \
+   text$/shared$/guide$/filternavigator.hzip \
+   text$/shared$/guide$/find_attributes.hzip \
    text$/shared$/guide$/flat_icons.hzip \
    text$/shared$/guide$/floating_toolbar.hzip \
+   text$/shared$/guide$/fontwork.hzip \
    text$/shared$/guide$/formfields.hzip \
-   text$/shared$/guide$/functionbar_edit.hzip \
    text$/shared$/guide$/gallery_insert.hzip \
    text$/shared$/guide$/hyperlink_edit.hzip \
    text$/shared$/guide$/hyperlink_insert.hzip \
@@ -764,8 +860,6 @@ LINKLINKFILES= \
    text$/shared$/guide$/insert_bitmap.hzip \
    text$/shared$/guide$/insert_graphic_drawit.hzip \
    text$/shared$/guide$/insert_specialchar.hzip \
-   text$/shared$/guide$/install_change.hzip \
-   text$/shared$/guide$/install_repair.hzip \
    text$/shared$/guide$/integratinguno.hzip \
    text$/shared$/guide$/keyboard.hzip \
    text$/shared$/guide$/labels.hzip \
@@ -780,6 +874,7 @@ LINKLINKFILES= \
    text$/shared$/guide$/measurement_units.hzip \
    text$/shared$/guide$/microsoft_terms.hzip \
    text$/shared$/guide$/mobiledevicefilters.hzip \
+   text$/shared$/guide$/ms_doctypes.hzip \
    text$/shared$/guide$/ms_import_export_limitations.hzip \
    text$/shared$/guide$/ms_user.hzip \
    text$/shared$/guide$/navigator.hzip \
@@ -788,10 +883,10 @@ LINKLINKFILES= \
    text$/shared$/guide$/numbering_stop.hzip \
    text$/shared$/guide$/pageformat_max.hzip \
    text$/shared$/guide$/paintbrush.hzip \
+   text$/shared$/guide$/pasting.hzip \
    text$/shared$/guide$/print_blackwhite.hzip \
    text$/shared$/guide$/print_faster.hzip \
    text$/shared$/guide$/protection.hzip \
-   text$/shared$/guide$/quicklaunch.hzip \
    text$/shared$/guide$/redlining.hzip \
    text$/shared$/guide$/redlining_accept.hzip \
    text$/shared$/guide$/redlining_doccompare.hzip \
@@ -800,21 +895,20 @@ LINKLINKFILES= \
    text$/shared$/guide$/redlining_protect.hzip \
    text$/shared$/guide$/redlining_versions.hzip \
    text$/shared$/guide$/round_corner.hzip \
+   text$/shared$/guide$/scripting.hzip \
    text$/shared$/guide$/space_hyphen.hzip \
    text$/shared$/guide$/spadmin.hzip \
    text$/shared$/guide$/standard_template.hzip \
    text$/shared$/guide$/start_parameters.hzip \
-   text$/shared$/guide$/symbolbar_switch.hzip \
    text$/shared$/guide$/table_cellmerge.hzip \
    text$/shared$/guide$/tabs.hzip \
    text$/shared$/guide$/text_color.hzip \
    text$/shared$/guide$/textmode_change.hzip \
    text$/shared$/guide$/undo_formatting.hzip \
-   text$/shared$/guide$/url_autocomplete.hzip \
-   text$/shared$/guide$/url_open.hzip \
    text$/shared$/guide$/version_number.hzip \
    text$/shared$/guide$/viewing_file_properties.hzip \
    text$/shared$/guide$/workfolder.hzip \
+   text$/shared$/guide$/xforms.hzip \
    text$/shared$/guide$/xsltfilter.hzip \
    text$/shared$/main0108.hzip \
    text$/shared$/main0201.hzip \
@@ -854,6 +948,8 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01020000.hzip \
    text$/shared$/optionen$/01020100.hzip \
    text$/shared$/optionen$/01020200.hzip \
+   text$/shared$/optionen$/01020300.hzip \
+   text$/shared$/optionen$/01020400.hzip \
    text$/shared$/optionen$/01030000.hzip \
    text$/shared$/optionen$/01030300.hzip \
    text$/shared$/optionen$/01030500.hzip \
@@ -865,9 +961,9 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01040500.hzip \
    text$/shared$/optionen$/01040600.hzip \
    text$/shared$/optionen$/01040700.hzip \
-   text$/shared$/optionen$/01040801.hzip \
    text$/shared$/optionen$/01040900.hzip \
    text$/shared$/optionen$/01041000.hzip \
+   text$/shared$/optionen$/01041100.hzip \
    text$/shared$/optionen$/01050000.hzip \
    text$/shared$/optionen$/01050100.hzip \
    text$/shared$/optionen$/01050300.hzip \
@@ -899,9 +995,21 @@ LINKLINKFILES= \
    text$/shared$/optionen$/01150300.hzip \
    text$/shared$/optionen$/01160000.hzip \
    text$/shared$/optionen$/01160100.hzip \
+   text$/shared$/optionen$/01160200.hzip \
+   text$/shared$/optionen$/01160201.hzip \
    text$/shared$/optionen$/java.hzip \
    text$/shared$/optionen$/javaclasspath.hzip \
    text$/shared$/optionen$/javaparameters.hzip \
+   text$/shared$/optionen$/macrosecurity.hzip \
+   text$/shared$/optionen$/macrosecurity_sl.hzip \
+   text$/shared$/optionen$/macrosecurity_ts.hzip \
+   text$/shared$/optionen$/mailmerge.hzip \
+   text$/shared$/optionen$/serverauthentication.hzip \
+   text$/shared$/optionen$/testaccount.hzip \
+   text$/shared$/optionen$/viewcertificate.hzip \
+   text$/shared$/optionen$/viewcertificate_c.hzip \
+   text$/shared$/optionen$/viewcertificate_d.hzip \
+   text$/shared$/optionen$/viewcertificate_g.hzip \
    text$/shared$/tree_strings.hzip \
 
 
@@ -909,4 +1017,3 @@ LINKLINKFILES= \
 
 .INCLUDE :  target.mk
 .INCLUDE :  $(PRJ)$/util$/target.pmk
-