[oe-commits] org.oe.dev merge of '2233080e8bdaa3d4a3eb8a016e6bb014d7c38e45'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Feb 9 16:11:31 UTC 2008
merge of '2233080e8bdaa3d4a3eb8a016e6bb014d7c38e45'
and '95c3495ce460c2f8f04e1188464c72bde51ce0c9'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e5daaf5266a88817d8834a0117cda229cdad7c67
ViewMTN: http://monotone.openembedded.org/revision/info/e5daaf5266a88817d8834a0117cda229cdad7c67
Files:
1
packages/taglib/taglibc_1.4.bb
packages/taglib/files
packages/taglib/files/taglib_1.4-8.diff.gz
packages/e17/enna_cvs.bb
packages/taglib/taglib_1.4.bb
mtn:manual_merge
true
contrib/angstrom/rss.php
contrib/angstrom/rss2.php
packages/logic-analyzer
packages/logic-analyzer/files
packages/rxtx
packages/rxtx/files
packages/jamvm/files/debian-jni.patch
packages/klibc/files/klibc-config-eabi.patch
packages/logic-analyzer/files/client-makefile.patch
packages/logic-analyzer/files/cp-run-fix.patch
packages/logic-analyzer/logic-analyzer_0.8.bb
packages/rxtx/files/rxtx-fixes-from-debian.patch
packages/rxtx/rxtx_2.1-7r2.bb
classes/java.bbclass
packages/cacao/cacao.inc
packages/cacao/cacao_0.98+hg20071001.bb
packages/dcop/dcopidl-native_3.5.4.bb
packages/dcop/dcopidl2cpp-native_3.5.4.bb
packages/jamvm/jamvm.inc
packages/jamvm/jamvm_1.5.0.bb
packages/klibc/klibc-utils-static_1.5.bb
packages/libxml/libxml++_2.14.0.bb
Diffs:
#
# mt diff -r2233080e8bdaa3d4a3eb8a016e6bb014d7c38e45 -re5daaf5266a88817d8834a0117cda229cdad7c67
#
#
#
# delete "packages/taglib/taglibc_1.4.bb"
#
# add_dir "packages/taglib/files"
#
# add_file "packages/taglib/files/taglib_1.4-8.diff.gz"
# content [c71a982f1f2f332c4477100d574d2031d3bf4b18]
#
# patch "packages/e17/enna_cvs.bb"
# from [85178607c7932e6f49e8e5ac0cecf5631cc84b2c]
# to [829b76d4efae3a18edc2a557c1e41e509f4b1c30]
#
# patch "packages/taglib/taglib_1.4.bb"
# from [ba6c47f548d00f94ed177f8934c40cbaea043095]
# to [be06346f9694f8bab9ce367bdfcaeff9f45d0345]
#
# set "packages/taglib/files/taglib_1.4-8.diff.gz"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
# packages/taglib/files/taglib_1.4-8.diff.gz is binary
============================================================
--- packages/e17/enna_cvs.bb 85178607c7932e6f49e8e5ac0cecf5631cc84b2c
+++ packages/e17/enna_cvs.bb 829b76d4efae3a18edc2a557c1e41e509f4b1c30
@@ -1,7 +1,7 @@ DEPENDS = "curl dbus eet evas edje ecore
DESCRIPTION = "Enna is a media center application based on EFL"
LICENSE = "GPL"
DEPENDS = "curl dbus eet evas edje ecore edbus emotion"
-DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglibc"
+DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib"
SECTION = "x11/multimedia"
PV = "0.2.0+cvs${SRCDATE}"
============================================================
--- packages/taglib/taglib_1.4.bb ba6c47f548d00f94ed177f8934c40cbaea043095
+++ packages/taglib/taglib_1.4.bb be06346f9694f8bab9ce367bdfcaeff9f45d0345
@@ -1,41 +1,24 @@ DESCRIPTION = "TagLib is a library for r
DESCRIPTION = "TagLib is a library for reading and editing the meta-data of several popular audio formats"
-SECTION = "libs"
+SECTION = "libs/multimedia"
HOMEPAGE = "http://developer.kde.org/~wheeler/taglib.html"
LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz"
+SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \
+ file://taglib_1.4-8.diff.gz;patch=1"
S = "${WORKDIR}/taglib-${PV}"
-inherit autotools qmake_base pkgconfig binconfig
+inherit autotools pkgconfig binconfig
-export OE_QMAKE_LINK="${CXX}"
-
-do_configure() {
- # calling oe_runconf to generate pkgconfig and binconfig files
- oe_runconf
- cd ${S}/taglib && rm -f Makefile* && qmake -project -o tag.pro -t lib && \
- qmake -spec ${QMAKESPEC} -after CONFIG=console INCLUDEPATH+=${S}
+do_postpatch() {
+ rm -rf patches && rm -rf .pc && mv -f debian/patches patches && quilt push -av
}
+addtask postpatch after do_patch before do_configure
-do_compile() {
- oe_runmake -C taglib
+do_stage() {
+ autotools_stage_all
}
+PACKAGES =+ "${PN}-c"
+FILES_${PN}-dbg += "${bindir}/taglib-config"
+FILES_${PN}-c = "${libdir}/libtag_c.so.*"
-do_stage_append() {
- install -d ${STAGING_INCDIR}/taglib
- for i in `find taglib -name "*.h"`
- do
- install $i ${STAGING_INCDIR}/taglib/
- done
- for i in `find taglib -name "*.tcc"`
- do
- install $i ${STAGING_INCDIR}/taglib/
- done
- oe_libinstall -so -C taglib libtag ${STAGING_LIBDIR}
-}
-
-do_install() {
- install -d ${D}${libdir}
- oe_libinstall -so -C taglib libtag ${D}${libdir}
-}
#
# mt diff -r95c3495ce460c2f8f04e1188464c72bde51ce0c9 -re5daaf5266a88817d8834a0117cda229cdad7c67
#
#
#
# delete "contrib/angstrom/rss.php"
#
# rename "contrib/angstrom/rss2.php"
# to "contrib/angstrom/rss.php"
#
# add_dir "packages/logic-analyzer"
#
# add_dir "packages/logic-analyzer/files"
#
# add_dir "packages/rxtx"
#
# add_dir "packages/rxtx/files"
#
# add_file "packages/jamvm/files/debian-jni.patch"
# content [fde8e06ffb742cd42a2d3f9da5e021a1188c7bce]
#
# add_file "packages/klibc/files/klibc-config-eabi.patch"
# content [9ce82e5d2cc7597ec66f40fd0abe36685b998028]
#
# add_file "packages/logic-analyzer/files/client-makefile.patch"
# content [c6a0d4c4968fb621afe03dae451df33433205b87]
#
# add_file "packages/logic-analyzer/files/cp-run-fix.patch"
# content [16eb0d71c743389d198d7d289f721763d14a58df]
#
# add_file "packages/logic-analyzer/logic-analyzer_0.8.bb"
# content [1ee8013dcfa98eec177fbdfbfbb2ecb8167f8dad]
#
# add_file "packages/rxtx/files/rxtx-fixes-from-debian.patch"
# content [394e9d1873a38846dcb70eb3fa5e4d44fde48b82]
#
# add_file "packages/rxtx/rxtx_2.1-7r2.bb"
# content [3974ebf631b2b9bafd21186daeaaa81409ba5eec]
#
# patch "classes/java.bbclass"
# from [4c1064a0c1677fa3f136bebf5736ace413a11f30]
# to [4a470d4978ae2ef918625aa0f94f81ced60914df]
#
# patch "contrib/angstrom/rss.php"
# from [30cfd581394ae7f5e17996503a966670e246c014]
# to [e7777fbd2d572c613ee592f6e59c2c79731ffca0]
#
# patch "packages/cacao/cacao.inc"
# from [595f9dee8b31829f4c2a1e6565e8b3d7e4522473]
# to [d1fb162242cfc59d0aecad7027643cdec90b4b4d]
#
# patch "packages/cacao/cacao_0.98+hg20071001.bb"
# from [6b579068c4284eea4bb711e240a0e1ff839a8583]
# to [ac5e51b47c7d3446078d237ac95abd0fa9c668cc]
#
# patch "packages/dcop/dcopidl-native_3.5.4.bb"
# from [d59a902debf6b381a27d4ada33b9ac1a2b0fa225]
# to [1578e74d509d78b5e2e421c869dfcbbf69f3bdfc]
#
# patch "packages/dcop/dcopidl2cpp-native_3.5.4.bb"
# from [51ee91734486bf0055de5dee7bf715a896dcb520]
# to [70114ba9db0b75943f6fab62b2fc49d1dd2b0cd3]
#
# patch "packages/jamvm/jamvm.inc"
# from [5edcfc7c22cf4daf00c3d364962aa42af749237e]
# to [1eb0be17dafb30f822a0fad779c2d82f62088d2a]
#
# patch "packages/jamvm/jamvm_1.5.0.bb"
# from [645cab3c8ecedf36901ba0d416cb8956c85f04b1]
# to [7f3f0abf4aff253a69554613cd74fe49da01168d]
#
# patch "packages/klibc/klibc-utils-static_1.5.bb"
# from [41e2472d9b51fdff4af9dcd02e9a0fdc3be79d9f]
# to [0aeaa25067f4778c45bbbd7ec34c5031db9f1f12]
#
# patch "packages/libxml/libxml++_2.14.0.bb"
# from [187d10dec4db1b74dddc6d4bdbd94e1405d4b1d7]
# to [e3fd57cf2ced465e6ef806bf639ccfa210bf9810]
#
============================================================
--- packages/jamvm/files/debian-jni.patch fde8e06ffb742cd42a2d3f9da5e021a1188c7bce
+++ packages/jamvm/files/debian-jni.patch fde8e06ffb742cd42a2d3f9da5e021a1188c7bce
@@ -0,0 +1,19 @@
+--- src/dll.c.orig 2004-09-09 15:48:45.000000000 +0000
++++ src/dll.c 2004-09-09 15:50:32.000000000 +0000
+@@ -189,6 +189,16 @@
+ #ifndef NO_JNI
+ /* Init hash table, and create lock */
+ initHashTable(hash_table, HASHTABSZE, TRUE);
++
++ /* XXX: Add Debian JNI directory. */
++ char* path = getenv("LD_LIBRARY_PATH");
++
++ if (path != NULL)
++ path = strcat(path, ":OE_LIBDIR_JNI");
++ else
++ path = "OE_LIBDIR_JNI";
++
++ setenv("LD_LIBRARY_PATH", path, 1);
+ #endif
+ }
+
============================================================
--- packages/klibc/files/klibc-config-eabi.patch 9ce82e5d2cc7597ec66f40fd0abe36685b998028
+++ packages/klibc/files/klibc-config-eabi.patch 9ce82e5d2cc7597ec66f40fd0abe36685b998028
@@ -0,0 +1,9 @@
+diff -Nur klibc-1.5/defconfig klibc-1.5p/defconfig
+--- klibc-1.5/defconfig 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5p/defconfig 2008-02-08 19:24:22.337127756 +0100
+@@ -5,4 +5,4 @@
+ CONFIG_REGPARM=y
+ # ARM options
+ # CONFIG_KLIBC_THUMB is not set
+-# CONFIG_AEABI is not set
++CONFIG_AEABI=y
============================================================
--- packages/logic-analyzer/files/client-makefile.patch c6a0d4c4968fb621afe03dae451df33433205b87
+++ packages/logic-analyzer/files/client-makefile.patch c6a0d4c4968fb621afe03dae451df33433205b87
@@ -0,0 +1,426 @@
+Index: LogicAnalyzer/client/Makefile
+===================================================================
+--- LogicAnalyzer.orig/client/Makefile 2008-02-09 02:27:13.000000000 +0100
++++ LogicAnalyzer/client/Makefile 2008-02-09 02:28:34.000000000 +0100
+@@ -1,8 +1,412 @@
+-all:
+- jar cfm analyzer.jar \
+- Manifest.txt \
+- org/sump/analyzer/*.class \
+- org/sump/analyzer/tools/*.class \
+- org/sump/analyzer/icons/*.png \
+- org/sump/util/*.class \
+-
+\ No newline at end of file
++#
++# Makefile created at Fri Feb 8 23:36:42 2008, by mmake
++#
++
++# Programs (with common options):
++SHELL = /bin/sh
++CP = cp
++RM = rm -f
++MV = mv -f
++SED = sed
++ETAGS = etags
++XARGS = xargs
++CAT = cat
++FIND = find
++CPP = cpp -C -P
++
++INSTALL = install
++INSTALL_PROG = $(INSTALL) -m $(MODE_PROGS)
++INSTALL_FILE = $(INSTALL) -m $(MODE_FILES)
++INSTALL_DIR = $(INSTALL) -m $(MODE_DIRS) -d
++
++# Install modes
++MODE_PROGS = 555
++MODE_FILES = 444
++MODE_DIRS = 2755
++
++# Build programs
++JAVAC = ecj
++JAVADOC = javadoc
++JAR = fastjar
++
++# Build flags
++JAVAC_FLAGS =
++JAVADOC_FLAGS = -version -author
++JAR_FLAGS = cvf0
++JIKES_DEP_FLAG = +M
++
++# ------------------------------------------------------------------- #
++
++# Prefix for every install directory
++PREFIX =
++
++# Where to start installing the class files. Set this to an empty value
++# if you dont want to install classes
++CLASS_DIR = $(PREFIX)classes
++
++# The directory to install the jar file in. Set this to an empty value
++# if you dont want to install a jar file
++JAR_DIR = $(PREFIX)lib
++
++# The directory to install the app bundle in. Set this to an empty value
++# if you dont want to install an app bundle
++BUNDLE_DIR = $(PREFIX)lib
++
++
++# The directory to install html files generated by javadoc
++DOC_DIR = $(PREFIX)doc/api-docs
++
++# The directory to install script files in
++SCRIPT_DIR = $(PREFIX)bin
++
++# ------------------------------------------------------------------- #
++
++# The name of the jar file to install
++JAR_FILE = analyzer.jar
++
++#
++# The VERSION variable below should be set to a value
++# that will be tested in the .xjava code and Info.plist.
++#
++VERSION = CHANGE_ME
++
++# ------------------------------------------------------------------- #
++
++# The name of the OS X Application Bundle to install
++BUNDLE_FILE =
++
++# Folder containing App Bundle resources (Info.plist, *.icns, etc.)
++BUNDLE_RESOURCE_DIR = misc/macosx
++
++# Items to copy to the Resources folder of the bundle
++BUNDLE_RESOURCES = $(addsuffix .icns, $(basename $(APP_FILE)) Document)
++
++# Location of JavaApplicatonStub
++JAVA_STUB = /System/Library/Frameworks/JavaVM.framework/Resources/MacOS/JavaApplicationStub
++
++# ------------------------------------------------------------------- #
++
++# Resource files:
++# Extend the list to install other files of your choice
++RESOURCE_SRC := *.properties *.gif *.au
++
++# Objects that should go into the jar file. (find syntax)
++JAR_OBJS := \( -name '*.class' -o -name '*.gif' -o -name "*.au" \
++ -o -name '*.properties' \
++ -o -name '*.png' \)
++
++# Include the separate variables file if it exists
++MAKEFILE_VARS = makefile.vars
++VARS = $(wildcard $(MAKEFILE_VARS))
++ifneq ($(VARS),)
++ include $(MAKEFILE_VARS)
++endif
++
++
++# Packages we should compile
++PACKAGES = \
++ org.sump.analyzer.tools \
++ org.sump.util \
++ org.sump.analyzer
++
++
++# All packages that can be recursively compiled.
++ALL_PACKAGES = \
++ org \
++ org.sump \
++ $(PACKAGES)
++
++
++# Packages to generate docs for.
++JAVADOC_PACKAGES = $(PACKAGES)
++
++
++# Resource packages
++RESOURCES = \
++ doc.resources
++
++
++# Directories with shell scripts
++SCRIPTS =
++
++# ------------------------------------------------------------------- #
++
++# A marker variable for the top level directory
++TOPLEVEL := .
++
++# Subdirectories with java files:
++JAVA_DIRS := $(subst .,/,$(PACKAGES)) $(TOPLEVEL)
++
++# Subdirectories with only resource files:
++RESOURCE_DIRS := $(subst .,/,$(RESOURCES))
++
++# All the .xjava source files:
++XJAVA_SRC := $(foreach dir, $(JAVA_DIRS), $(wildcard $(dir)/*.xjava))
++
++# All the xjava files to build
++XJAVA_OBJS := $(XJAVA_SRC:.xjava=.java)
++
++# Directory coresponding to a package
++PACKAGE_DIR = $(subst .,/,$(1))
++
++# All the (x)java files in a package
++PACKAGE_SRC = $(shell $(FIND) $(PACKAGE_DIR) \( -name '*.java' -or -name '*.xjava' \) )
++
++# All the classes to build in a package
++PACKAGE_OBJS = $(patsubst %.java,%.class,$(PACKAGE_SRC: %.xjava=%.java))
++
++# All the .java source files:
++JAVA_SRC := $(foreach dir, $(JAVA_DIRS), $(wildcard $(dir)/*.java))
++JAVA_SRC := $(XJAVA_OBJS) $(JAVA_SRC)
++
++# Dependency files:
++DEPEND_OBJS := $(JAVA_SRC:.java=.u)
++
++# The intermediate java files and main classes we should build:
++JAVA_OBJS := $(XJAVA_OBJS) $(JAVA_SRC:.java=.class)
++
++# Search for resource files in both JAVA_DIRS and RESOURCE_DIRS
++RESOURCE_OBJS := $(foreach dir, $(JAVA_DIRS) $(RESOURCE_DIRS), \
++ $(wildcard $(foreach file, $(RESOURCE_SRC), \
++ $(dir)/$(file))))
++
++# All the shell scripts source
++SCRIPT_SRCS := $(foreach dir, $(SCRIPTS), $(wildcard $(dir)/*.sh))
++# All shell scripts we should install
++SCRIPT_OBJS := $(SCRIPT_SRCS:.sh=)
++
++# All the files to install into CLASS_DIR
++INSTALL_OBJS := $(foreach dir, $(JAVA_DIRS), $(wildcard $(dir)/*.class))
++# Escape inner class delimiter $
++INSTALL_OBJS := $(subst $$,\$$,$(INSTALL_OBJS))
++# Add the resource files to be installed as well
++INSTALL_OBJS := $(INSTALL_OBJS) $(RESOURCE_OBJS)
++
++
++# ------------------------------------------------------------------- #
++
++
++define check-exit
++|| exit 1
++
++endef
++
++
++# -----------
++# Build Rules
++# -----------
++
++%.java: %.xjava
++ $(CPP) -D$(VERSION) $< $@
++
++%.class: %.java
++ $(JAVAC) $(JAVAC_FLAGS) $<
++
++%.jar: $(JAVA_OBJS) $(RESOURCE_OBJS)
++ $(FIND) $(TOPLEVEL) $(JAR_OBJS) -print | $(XARGS) \
++ $(JAR) $(JAR_FLAGS) $(JAR_FILE)
++
++%.u: %.java
++ $(JAVAC) $(JIKES_DEP_FLAG) $<
++
++
++# -------
++# Targets
++# -------
++
++.PHONY: all jar install uninstall doc clean depend tags bundle \
++ help $(ALL_PACKAGES)
++
++all:: $(JAVA_OBJS)
++
++help:
++ @echo "Usage: make {all|jar|srcjar|bundle|install|uninstall|doc|clean|depend|tags|PACKAGE_NAME}"
++ @echo " all: build all classes"
++ @echo " jar: build jar file"
++ @echo " srcjar: build source jar file"
++ @echo " bundle: build OS X app bundle"
++ @echo " install: install classes into $(CLASS_DIR)"
++ @echo " jar into $(JAR_DIR)"
++ @echo " bundle into $(BUNDLE_DIR)"
++ @echo " javadocs into $(DOC_DIR)"
++ @echo " scripts into $(SCRIPT_DIR)"
++ @echo " uninstall: remove installed files"
++ @echo " doc: generate api docs from javadoc comments"
++ @echo " clean: remove classes and temporary files"
++ @echo " depend: build class dependency info using jikes"
++ @echo " tags: build emacs tags file"
++ @echo " PACKAGE_NAME: builds all classes in this package and any subpackages."
++
++# Jar target
++ifneq ($(strip $(JAR_FILE)),)
++jar: $(JAR_FILE)
++ifneq ($(strip $(JAR_DIR)),)
++install:: $(JAR_FILE)
++ @echo "===> [Installing jar file, $(JAR_FILE) in $(JAR_DIR)] "
++ $(INSTALL_DIR) $(JAR_DIR) $(check-exit)
++ $(INSTALL_FILE) $(JAR_FILE) $(JAR_DIR) $(check-exit)
++uninstall::
++ @echo "===> [Removing jar file, $(JAR_FILE) from $(JAR_DIR)] "
++ $(RM) $(JAR_DIR)/$(JAR_FILE) $(check-exit)
++else
++install::
++ @echo "No jar install dir defined"
++endif
++clean::
++ $(RM) $(JAR_FILE)
++else
++jar:
++ @echo "No jar file defined"
++endif
++
++SRC_JAR_FILE := $(basename $(JAR_FILE))-src$(suffix $JAR_FILE)
++
++# Source jar target
++srcjar : $(SRC_JAR_FILE)
++$(SRC_JAR_FILE): $(JAVA_SRC) $(RESOURCE_OBJS)
++ $(FIND) $(TOPLEVEL) $(JAR_OBJS: .class=.java) -print | $(XARGS) \
++ $(JAR) $(JAR_FLAGS) $@
++
++# Bundle target
++ifneq ($(strip $(BUNDLE_FILE)),)
++bundle: $(BUNDLE_FILE)
++$(BUNDLE_FILE) : $(JAR_FILE)
++ $(INSTALL_DIR) $(BUNDLE_FILE)/Contents/Resources/Java $(check-exit)
++ $(INSTALL_DIR) $(BUNDLE_FILE)/Contents/MacOS $(check-exit)
++ $(INSTALL_PROG) $(JAVA_STUB) $(BUNDLE_FILE)/Contents/MacOS/ \
++ $(check-exit)
++ ( $(CAT) $(BUNDLE_RESOURCE_DIR)/Info.plist | $(SED) -e \
++ s/VERSION/$(VERSION)/ >98762infoplist876 ) $(check-exit)
++ $(INSTALL_FILE) 98762infoplist876 \
++ $(BUNDLE_FILE)/Contents/Info.plist $(check-exit)
++ $(RM) 98762infoplist876 $(check-exit)
++ $(INSTALL_FILE) $(JAR_FILE) $(BUNDLE_FILE)/Contents/Resources/Java
++ checkexit="";for f in $(BUNDLE_RESOURCES); do \
++ $(INSTALL_FILE) $(BUNDLE_RESOURCE_DIR)$$f $(BUNDLE_FILE)/Contents/Resources/ \
++ || checkexit=$?; \
++ done; test -z $$checkexit
++
++ifneq ($(strip $(BUNDLE_DIR)),)
++# This is probably bad, but I don't know how else to do it
++install:: $(BUNDLE_FILE)
++ @echo "===> [Installing app bundle, $(BUNDLE_FILE) in $(BUNDLE_DIR)] "
++ $(INSTALL_DIR) $(BUNDLE_DIR) $(check-exit)
++ $(CP) -R $(BUNDLE_FILE) $(BUNDLE_DIR) $(check-exit)
++ $(INSTALL_FILE) $(BUNDLE_FILE) $(BUNDLE_DIR) $(check-exit)
++uninstall::
++ @echo "===> [Removing bundle file, $(BUNDLE_FILE) from $(BUNDLE_DIR)] "
++ $(RM) -r $(BUNDLE_DIR)/$(BUNDLE_FILE) $(check-exit)
++else
++install::
++ @echo "No bundle install dir defined"
++endif
++clean::
++ $(RM) -r $(BUNDLE_FILE)
++else
++bundle:
++ @echo "No bundle file defined"
++endif
++
++
++# Install target for Classes and Resources
++ifneq ($(strip $(CLASS_DIR)),)
++install:: $(JAVA_OBJS)
++ @echo "===> [Installing classes in $(CLASS_DIR)] "
++ $(INSTALL_DIR) $(CLASS_DIR) $(check-exit)
++ $(foreach dir, $(JAVA_DIRS) $(RESOURCE_DIRS), \
++ $(INSTALL_DIR) $(CLASS_DIR)/$(dir) $(check-exit))
++ $(foreach file, $(INSTALL_OBJS), \
++ $(INSTALL_FILE) $(file) $(CLASS_DIR)/$(file) \
++ $(check-exit))
++uninstall::
++ @echo "===> [Removing class-files from $(CLASS_DIR)] "
++ $(foreach file, $(INSTALL_OBJS), \
++ $(RM) $(CLASS_DIR)/$(file) \
++ $(check-exit))
++else
++# Print a warning here if you like. (No class install dir defined)
++endif
++
++
++
++# Depend target
++ifeq ($(findstring jikes,$(JAVAC)),jikes)
++depend: $(XJAVA_OBJS) $(DEPEND_OBJS)
++ ( $(CAT) $(DEPEND_OBJS) | $(SED) -e '/\.class$$/d' \
++ -e '/.*$$.*/d' > $(MAKEFILE_DEPEND); $(RM) $(DEPEND_OBJS); )
++else
++depend:
++ @echo "mmake needs the jikes compiler to build class dependencies"
++endif
++
++
++
++# Doc target
++ifneq ($(strip $(JAVADOC_PACKAGES)),)
++doc: $(JAVA_SRC)
++ @echo "===> [Installing java documentation in $(DOC_DIR)] "
++ $(INSTALL_DIR) $(DOC_DIR) $(check-exit)
++ $(JAVADOC) $(JAVADOC_FLAGS) -d $(DOC_DIR) $(JAVADOC_PACKAGES)
++else
++doc:
++ @echo "You must put your source files in a package to run make doc"
++endif
++
++
++
++# Script target
++ifneq ($(strip $(SCRIPT_OBJS)),)
++all:: $(SCRIPT_OBJS)
++ifneq ($(strip $(SCRIPT_DIR)),)
++install:: $(SCRIPT_OBJS)
++ @echo "===> [Installing shell-scripts in $(SCRIPT_DIR)] "
++ $(INSTALL_DIR) $(SCRIPT_DIR) $(check-exit)
++ $(foreach file, $(SCRIPT_OBJS), \
++ $(INSTALL_PROG) $(file) $(SCRIPT_DIR) $(check-exit))
++uninstall::
++ @echo "===> [Removing shell-scripts from $(SCRIPT_DIR)] "
++ $(foreach file, $(SCRIPT_OBJS), \
++ $(RM) $(SCRIPT_DIR)/$(file) $(check-exit))
++else
++# Print a warning here if you like. (No script install dir defined)
++endif
++clean::
++ rm -f $(SCRIPT_OBJS)
++endif
++
++
++
++# Tag target
++tags:
++ @echo "Tagging"
++ $(ETAGS) $(filter-out $(XJAVA_OBJS), $(JAVA_SRC)) $(XJAVA_SRC)
++
++
++
++# Various cleanup routines
++clean::
++ $(FIND) . \( -name '*~' -o -name '*.class' \) -print | \
++ $(XARGS) $(RM)
++ $(FIND) . -name '*.u' -print | $(XARGS) $(RM)
++
++ifneq ($(strip $(XJAVA_SRC)),)
++clean::
++ $(RM) $(XJAVA_OBJS)
++endif
++
++# ----------------------------------------
++# Include the dependency graph if it exist
++# ----------------------------------------
++MAKEFILE_DEPEND = makefile.dep
++DEPEND = $(wildcard $(MAKEFILE_DEPEND))
++ifneq ($(DEPEND),)
++ include $(MAKEFILE_DEPEND)
++endif
++
++#package targets
++org : $(call PACKAGE_OBJS,org)
++org.sump : %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list