Merge
This commit is contained in:
commit
7fa0ab5a1c
@ -144,6 +144,7 @@ $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logut
|
||||
-include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d
|
||||
|
||||
ifeq ($(LOGWRAPPERS_ARE_CREATED), yes)
|
||||
|
||||
$(eval $(call SetupIdlCompilation,BUILD_IDLS, \
|
||||
IDLJ := $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \
|
||||
SRC := $(CORBA_TOPDIR)/src/share/classes, \
|
||||
@ -166,6 +167,7 @@ ifeq ($(LOGWRAPPERS_ARE_CREATED),yes)
|
||||
-include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
|
||||
|
||||
ifeq ($(IDLS_ARE_CREATED), yes)
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_CORBA, \
|
||||
SETUP := GENERATE_NEWBYTECODE, \
|
||||
SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \
|
||||
|
Loading…
x
Reference in New Issue
Block a user