INTEGRATION: CWS jsc21 (1.2.106); FILE MERGED

2008/05/23 11:55:46 jsc 1.2.106.1: #i88797# change OFFICE_TYPE_LIBRARY to URE_TYPES and OFFICE_TYPES

odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile

@@ -2,9 +2,9 @@
 #
 #  $RCSfile: Makefile,v $
 #
-#  $Revision: 1.2 $
+#  $Revision: 1.3 $
 #
-#  last change: $Author: kz $ $Date: 2006-10-04 16:21:26 $
+#  last change: $Author: rt $ $Date: 2008-07-11 14:19:45 $
 #
 #  The Contents of this file are made available subject to the terms of
 #  the BSD license.
@@ -112,7 +112,7 @@ $(COMP_GEN_OUT)/%.rdb : $(GEN_URDFILES)
 
 $(GEN_CLASSFILES) : $(COMP_RDB)
 	-$(MKDIR) $(subst /,$(PS),$(@D))
-	$(JAVAMAKER) -BUCR -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT) $(COMP_RDB) $(OFFICE_TYPE_LIBRARY)
+	$(JAVAMAKER) -BUCR -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT) $(COMP_RDB) -X$(URE_TYPES) -X$(OFFICE_TYPES)
 
 # component as well as application are dependent from the generated types
 # rule for component class files
@@ -147,7 +147,7 @@ $(COMP_PACKAGE) : $(COMP_RDB) $(COMP_JAR) $(COMP_UNOPKG_MANIFEST) $(COMP_LOCAL_F
 	cd $(subst /,$(PS),$(SAMPLE_CLASS_OUT)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_JAR_NAME)
 	cd $(subst /,$(PS),$(COMP_GEN_OUT)) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
 	$(SDK_ZIP) -u $@ $(COMP_LOCAL_FILES)
-	
+
 $(COMP_REGISTERFLAG) : $(COMP_PACKAGE)
 ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES"
 	-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))