ICU-8.11.1.tar.gz

[apple/icu.git] / icuSources / tools / pkgdata / sttcmode.c

diff --git a/icuSources/tools/pkgdata/sttcmode.c b/icuSources/tools/pkgdata/sttcmode.c
index 57fd7e86baf862e6f1af68e9a216a0d0f631e90f..568dec7b618effa97c2cf62a92afe48372a8c920 100644 (file)
--- a/icuSources/tools/pkgdata/sttcmode.c
+++ b/icuSources/tools/pkgdata/sttcmode.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 *
 /******************************************************************************
 *

-*   Copyright (C) 2002-2004, International Business Machines
+*   Copyright (C) 2002-2006, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************


@@ -35,11 +35,13 @@
 /** set if AR is NOT to be called implicitly by gnumake 
  ** (i.e. if  the form   libblah.a($(OBJECTS) doesnt work) 
  **/
 /** set if AR is NOT to be called implicitly by gnumake 
  ** (i.e. if  the form   libblah.a($(OBJECTS) doesnt work) 
  **/

+#if !defined(NO_IMPLICIT_AR)

 #if defined(OS400) || defined(OS390)
 #    define NO_IMPLICIT_AR  1
 #else
 #    define NO_IMPLICIT_AR  0
 #endif
 #if defined(OS400) || defined(OS390)
 #    define NO_IMPLICIT_AR  1
 #else
 #    define NO_IMPLICIT_AR  0
 #endif

+#endif

 
 void pkg_sttc_writeReadme(struct UPKGOptions_ *o, const char *libName, UErrorCode *status)
 {
 
 void pkg_sttc_writeReadme(struct UPKGOptions_ *o, const char *libName, UErrorCode *status)
 {


@@ -204,13 +206,8 @@ void pkg_mode_static(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
 
     T_FileStream_writeLine(makefile, "# 'TOCOBJ' contains C Table of Contents objects [if any]\n");
 
 
     T_FileStream_writeLine(makefile, "# 'TOCOBJ' contains C Table of Contents objects [if any]\n");
 

-    if(!o->embed) {

     sprintf(tmp, "$(TEMP_PATH)$(NAME)_dat.c: $(CMNLIST)\n"
             "\t$(INVOKE) $(GENCMN) -e $(ENTRYPOINT) -n $(NAME) -S -s $(SRCDIR) -d $(TEMP_DIR) 0 $(CMNLIST)\n\n");
     sprintf(tmp, "$(TEMP_PATH)$(NAME)_dat.c: $(CMNLIST)\n"
             "\t$(INVOKE) $(GENCMN) -e $(ENTRYPOINT) -n $(NAME) -S -s $(SRCDIR) -d $(TEMP_DIR) 0 $(CMNLIST)\n\n");

-    } else {
-      sprintf(tmp, "$(TEMP_PATH)$(NAME)_dat.c: $(CMNLIST)\n"
-            "\t$(INVOKE) $(GENCMN) -e $(ENTRYPOINT) -n $(NAME) -S -E -d $(TEMP_DIR) 0 $(CMNLIST)\n\n");
-    }

     T_FileStream_writeLine(makefile, tmp);
 
     sprintf(tmp, "TOCOBJ= $(NAME)_dat.$(STATIC_O)\n\n");
     T_FileStream_writeLine(makefile, tmp);
 
     sprintf(tmp, "TOCOBJ= $(NAME)_dat.$(STATIC_O)\n\n");