X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/374ca955a76ecab1204ca8bfa63ff9238d998416..d5d484b0fbe924d3663b177965538d517ee412c1:/icuSources/tools/pkgdata/sttcmode.c diff --git a/icuSources/tools/pkgdata/sttcmode.c b/icuSources/tools/pkgdata/sttcmode.c index 57fd7e86..568dec7b 100644 --- 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. * ******************************************************************************* @@ -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) **/ +#if !defined(NO_IMPLICIT_AR) #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) { @@ -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"); - 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"); - } 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");