1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
David Katleman 2013-10-16 11:55:46 -07:00
commit 7fa0ab5a1c
2 changed files with 166 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
corba/makefiles/BuildCorba.gmk
View File

@ -144,6 +144,7 @@ $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logut
-include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d -include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d
ifeq ($(LOGWRAPPERS_ARE_CREATED), yes) ifeq ($(LOGWRAPPERS_ARE_CREATED), yes)
$(eval $(call SetupIdlCompilation,BUILD_IDLS, \ $(eval $(call SetupIdlCompilation,BUILD_IDLS, \
IDLJ := $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \ IDLJ := $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \
SRC := $(CORBA_TOPDIR)/src/share/classes, \ SRC := $(CORBA_TOPDIR)/src/share/classes, \
@ -166,6 +167,7 @@ ifeq ($(LOGWRAPPERS_ARE_CREATED),yes)
-include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
ifeq ($(IDLS_ARE_CREATED), yes) ifeq ($(IDLS_ARE_CREATED), yes)
$(eval $(call SetupJavaCompilation,BUILD_CORBA, \ $(eval $(call SetupJavaCompilation,BUILD_CORBA, \
SETUP := GENERATE_NEWBYTECODE, \ SETUP := GENERATE_NEWBYTECODE, \
SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \ SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \