You are viewing a plain text version of this content. The canonical link for it is here.
Posted to triplesoup-commits@incubator.apache.org by dr...@apache.org on 2007/04/28 20:56:43 UTC
svn commit: r533424 - in /incubator/triplesoup/code/trunk: Makefile bin/
bin/Makefile bin/b/ bin/b/Makefile.in bin/b/bproc.c bin/b/rdf2b.c
build/rules.mk.in configure.ac include/b.h libraries/b/b.h
Author: dreid
Date: Sat Apr 28 13:56:42 2007
New Revision: 533424
URL: http://svn.apache.org/viewvc?view=rev&rev=533424
Log:
- move b.h into the global include dir
- add a bin directory with binaries
- build bproc and rdf2b
Added:
incubator/triplesoup/code/trunk/bin/
incubator/triplesoup/code/trunk/bin/Makefile
incubator/triplesoup/code/trunk/bin/b/ (with props)
incubator/triplesoup/code/trunk/bin/b/Makefile.in
incubator/triplesoup/code/trunk/bin/b/bproc.c
- copied unchanged from r531091, incubator/triplesoup/donations/TRIPLES-2-libb/utils/bproc.c
incubator/triplesoup/code/trunk/bin/b/rdf2b.c
- copied unchanged from r531091, incubator/triplesoup/donations/TRIPLES-2-libb/utils/rdf2b.c
incubator/triplesoup/code/trunk/include/b.h
- copied unchanged from r531091, incubator/triplesoup/code/trunk/libraries/b/b.h
Removed:
incubator/triplesoup/code/trunk/libraries/b/b.h
Modified:
incubator/triplesoup/code/trunk/Makefile
incubator/triplesoup/code/trunk/build/rules.mk.in
incubator/triplesoup/code/trunk/configure.ac
Modified: incubator/triplesoup/code/trunk/Makefile
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/Makefile?view=diff&rev=533424&r1=533423&r2=533424
==============================================================================
--- incubator/triplesoup/code/trunk/Makefile (original)
+++ incubator/triplesoup/code/trunk/Makefile Sat Apr 28 13:56:42 2007
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-DIRS=libraries modules
+DIRS=libraries modules bin
all:
@for d in $(DIRS); do \
Added: incubator/triplesoup/code/trunk/bin/Makefile
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/bin/Makefile?view=auto&rev=533424
==============================================================================
--- incubator/triplesoup/code/trunk/bin/Makefile (added)
+++ incubator/triplesoup/code/trunk/bin/Makefile Sat Apr 28 13:56:42 2007
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+DIRS=b
+
+all:
+ @for d in $(DIRS); do \
+ echo "\tBuilding in $$d"; \
+ (cd $$d && make --no-print-directory) || exit 1; \
+ done
+
+clean:
+ @for d in $(DIRS); do \
+ echo "\tCleaning in $$d"; \
+ (cd $$d && make clean --no-print-directory) || exit 1; \
+ done
Propchange: incubator/triplesoup/code/trunk/bin/b/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 28 13:56:42 2007
@@ -0,0 +1,4 @@
+*.o
+bproc
+rdf2b
+Makefile
Added: incubator/triplesoup/code/trunk/bin/b/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/bin/b/Makefile.in?view=auto&rev=533424
==============================================================================
--- incubator/triplesoup/code/trunk/bin/b/Makefile.in (added)
+++ incubator/triplesoup/code/trunk/bin/b/Makefile.in Sat Apr 28 13:56:42 2007
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+topsrcdir = @top_srcdir@
+
+include $(topsrcdir)/build/rules.mk
+
+### defines
+rdf2b_EXTRA_LIBS=$(REDLAND_LDFLAGS)
+
+### Rules
+all: bproc rdf2b
+
+bproc: bproc.o
+ $(MAKE_BIN_SINGLE_OBJ)
+
+rdf2b: rdf2b.o
+ $(MAKE_BIN_SINGLE_OBJ)
+
+clean:
+ $(RM) -f *.o *.lo *~ bproc rdf2b
Modified: incubator/triplesoup/code/trunk/build/rules.mk.in
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/build/rules.mk.in?view=diff&rev=533424&r1=533423&r2=533424
==============================================================================
--- incubator/triplesoup/code/trunk/build/rules.mk.in (original)
+++ incubator/triplesoup/code/trunk/build/rules.mk.in Sat Apr 28 13:56:42 2007
@@ -25,6 +25,9 @@
SO_EXT=@SO_EXT@
SO_FLAGS=@SO_FLAGS@
+# Static library usage definition
+STATIC_LIBS=$(TOPDIR)/libraries/b/libb.$(A_EXT)
+
# This line is as far as configure needs to touch - below it we simply
# use the options defined above for our nefarious means.
@@ -33,6 +36,13 @@
MAKE_SHARED=@$(CC) $(SO_FLAGS) -o lib$(MODULE).$(SO_EXT) \
$(LOBJS) $(LDFLAGS) && \
echo "\t\tShared library lib$(MODULE).$(SO_EXT) created"
+
+# This rules makes a binary object that comrpises a single object, passed
+# in using the '$<' argument. Created objects use static linkages to
+# try and make sure they are usable.
+# i.e. this rules should NEVER be used for files destined to be installed!!!
+MAKE_BIN_SINGLE_OBJ=@$(CC) $(LDFLAGS) $< $(STATIC_LIBS) $($@_EXTRA_LIBS) -o $@ \
+ && echo "\t\tBinary object $@ created"
# Rules for making objects
#
Modified: incubator/triplesoup/code/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/configure.ac?view=diff&rev=533424&r1=533423&r2=533424
==============================================================================
--- incubator/triplesoup/code/trunk/configure.ac (original)
+++ incubator/triplesoup/code/trunk/configure.ac Sat Apr 28 13:56:42 2007
@@ -74,7 +74,8 @@
AC_SUBST(SO_EXT)
AC_SUBST(SO_FLAGS)
-AC_CONFIG_FILES([build/rules.mk
+AC_CONFIG_FILES([bin/b/Makefile
+ build/rules.mk
libraries/b/Makefile
modules/sparql/Makefile])