Skip to content

Commit 7397e65

Browse files
author
smcmahonibm
committed
$(JEX_OBJS)
1 parent 3df41bd commit 7397e65

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

iccpkg/platforms/UNIX.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ $(GSK_LIB_STATIC): $(GSK_SDK)/static gsk_wrap2$(OBJSUFX) $(EX_OBJS) \
3838
$(OLD_ICC_OBJ_CLEAN)
3939

4040
# Java
41-
$(JGSK_LIBNAME): $(JGSK_SDK)/debug $(JGSK_DIR) jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
41+
$(JGSK_LIBNAME): $(JGSK_SDK)/debug $(JGSK_DIR) jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
4242
$(JTIMER_OBJS) $(PACKAGE_DIR)/iccsdk/$(ICCLIB) $(MUPPET) \
4343
$(ZLIB_LIB)
44-
$(SLD) $(SLDFLAGS) jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
44+
$(SLD) $(SLDFLAGS) jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
4545
$(JTIMER_OBJS) $(PACKAGE_DIR)/iccsdk/$(ICCLIB) $(MUPPET) \
4646
$(ZLIB_LIB) $(EXPORT_FLAG)$(JCCPKG_EXPFILE) \
4747
$(LDLIBS)

iccpkg/platforms/WIN32_.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ $(GSK_LIB_STATIC): $(GSK_SDK)/static gsk_wrap2$(OBJSUFX) $(EX_OBJS) \
4040
# Java variant
4141
# $(JGSK_LIBNAME) is defined in gsk_crypto.mk
4242

43-
$(JGSK_LIBNAME): $(JGSK_SDK)/lib $(JGSK_SDK)/debug jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
43+
$(JGSK_LIBNAME): $(JGSK_SDK)/lib $(JGSK_SDK)/debug jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
4444
$(JTIMER_OBJS) $(PACKAGE_DIR)/iccsdk/$(ICCLIB) $(MUPPET) \
4545
$(ZLIB_LIB) icc.res
46-
$(SLD) $(SLDFLAGS) -DEBUG -PDB:$(JGSKLIB_B).pdb jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
46+
$(SLD) $(SLDFLAGS) -DEBUG -PDB:$(JGSKLIB_B).pdb jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
4747
$(JTIMER_OBJS) $(PACKAGE_DIR)/iccsdk/$(ICCLIB) $(MUPPET) \
4848
$(ZLIB_LIB) $(EXPORT_FLAG)$(JCCPKG_EXPFILE) \
4949
$(LDLIBS)

iccpkg/platforms/WIN64_.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ $(GSK_LIB_STATIC): $(GSK_SDK)/static gsk_wrap2$(OBJSUFX) $(EX_OBJS) \
4040
# Java
4141
# $(JGSK_LIBNAME) is defined in gsk_crypto.mk
4242

43-
$(JGSK_LIBNAME): $(JGSK_SDK)/lib $(JGSK_SDK)/debug jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
43+
$(JGSK_LIBNAME): $(JGSK_SDK)/lib $(JGSK_SDK)/debug jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
4444
$(JTIMER_OBJS) $(PACKAGE_DIR)/iccsdk/$(ICCLIB) $(MUPPET) \
4545
$(ZLIB_LIB) icc.res
46-
$(SLD) $(SLDFLAGS) -DEBUG -PDB:$(JGSKLIB_B)_64.pdb jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
46+
$(SLD) $(SLDFLAGS) -DEBUG -PDB:$(JGSKLIB_B)_64.pdb jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
4747
$(JTIMER_OBJS) $(PACKAGE_DIR)/iccsdk/$(ICCLIB) $(MUPPET) \
4848
$(ZLIB_LIB) $(EXPORT_FLAG)$(JCCPKG_EXPFILE) \
4949
$(LDLIBS)

iccpkg/platforms/ZOS31_.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ $(GSK_LIB_STATIC): $(GSK_SDK)/static gsk_wrap2$(OBJSUFX) $(EX_OBJS) \
4343
$(OLD_ICC_OBJ_CLEAN)
4444

4545
# Java
46-
$(JGSK_LIBNAME): $(JGSK_SDK) jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
46+
$(JGSK_LIBNAME): $(JGSK_SDK) jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
4747
$(JTIMER_OBJS) ../icc/csvquery.o \
4848
$(PACKAGE_DIR)/iccsdk/$(ICCLIB) $(MUPPET) \
4949
$(ZLIB_LIB)
5050
if [ -e OLD_ICC/ZOS*/iccsdk/libicc.a ] ; then chtag -r OLD_ICC/ZOS*/iccsdk/libicc.a; fi
5151
if [ -e OLD_ICC/ZOS*A*/icc/icclib/ICCSIG.txt ] ; then chtag -c ISO8859-1 OLD_ICC/ZOS*A*/icc/icclib/ICCSIG.txt; fi
52-
$(SLD) $(SLDFLAGS) jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
52+
$(SLD) $(SLDFLAGS) jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
5353
$(JTIMER_OBJS) ../icc/csvquery.o \
5454
$(PACKAGE_DIR)/iccsdk/$(ICCLIB) $(MUPPET) \
5555
$(ZLIB_LIB) \

iccpkg/platforms/ZOS_.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ $(GSK_LIB_STATIC): $(GSK_SDK)/static gsk_wrap2$(OBJSUFX) $(EX_OBJS) \
6262
$(OLD_ICC_OBJ_CLEAN)
6363

6464
# Java
65-
$(JGSK_LIBNAME): $(JGSK_SDK) $(JGSK_DIR) jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
65+
$(JGSK_LIBNAME): $(JGSK_SDK) $(JGSK_DIR) jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
6666
$(JTIMER_OBJS) ../icc/csvquery_64.o \
6767
$(ZICCOBJ) $(MUPPET) \
6868
$(ZLIB_LIB)
6969
if [ -e OLD_ICC/ZOS*/iccsdk/libicc.a ] ; then chtag -r OLD_ICC/ZOS*/iccsdk/libicc.a; fi
7070
if [ -e OLD_ICC/ZOS*A*/icc/icclib/ICCSIG.txt ] ; then chtag -c ISO8859-1 OLD_ICC/ZOS*A*/icc/icclib/ICCSIG.txt; fi
71-
$(SLD) $(SLDFLAGS) jgsk_wrap2$(OBJSUFX) jexp$(OBJSUFX) \
71+
$(SLD) $(SLDFLAGS) jgsk_wrap2$(OBJSUFX) $(JEX_OBJS) \
7272
$(JTIMER_OBJS) ../icc/csvquery_64.o \
7373
$(ZICCOBJ) $(MUPPET) \
7474
$(ZLIB_LIB) \

0 commit comments

Comments
 (0)