Changeset 232 for trunk/openjdk/jdk/make/common/Demo.gmk

Timestamp:

Jan 10, 2011, 12:26:50 AM (15 years ago)

Author:

dmik

Message:

jdk: Enabled building demos and samples.

File:

• trunk/openjdk/jdk/make/common/Demo.gmk (modified) (2 diffs)

trunk/openjdk/jdk/make/common/Demo.gmk

@@ -28 +28 @@
 # Some names are defined with LIBRARY inside the Defs.gmk file
 LIBRARY=$(DEMONAME)
+LIBRARY_SHORT=$(DEMONAME_SHORT)
 OBJDIR=$(TEMPDIR)/$(DEMONAME)
 
@@ -123 +124 @@
 ifneq ($(strip $(DEMO_ALL_NATIVE_SOURCES)),)
   # Path to native library we will create
-  DEMO_LIBRARY = \
-      $(DEMO_DESTDIR)/lib$(ISA_DIR)/$(LIB_PREFIX)$(DEMONAME).$(LIBRARY_SUFFIX)
+  ifneq ($(DEMONAME_SHORT),)
+    DEMO_LIBRARY = \
+        $(DEMO_DESTDIR)/lib$(ISA_DIR)/$(LIB_PREFIX)$(DEMONAME_SHORT).$(LIBRARY_SUFFIX)
+  else
+    DEMO_LIBRARY = \
+        $(DEMO_DESTDIR)/lib$(ISA_DIR)/$(LIB_PREFIX)$(DEMONAME).$(LIBRARY_SUFFIX)
+  endif
   # C and C++ compiler flags we need to add to standard flags
   DEMO_CPPFLAGS     += -I$(DEMO_BUILD_SRCDIR)