Join properly with build system (it uses lb.common yet), it compiles here now.

diff --git a/org.glite.lb-utils.db/.cvsignore b/org.glite.lb-utils.db/.cvsignore
index 69dd069..ff82493 100755 (executable)
--- a/org.glite.lb-utils.db/.cvsignore
+++ b/org.glite.lb-utils.db/.cvsignore
@@ -1,3 +1,5 @@
 .project
 .cdtproject
 build
+doc
+reports

diff --git a/org.glite.lb-utils.db/Makefile b/org.glite.lb-utils.db/Makefile
index 5a19948..2f96b36 100644 (file)
--- a/org.glite.lb-utils.db/Makefile
+++ b/org.glite.lb-utils.db/Makefile
@@ -104,7 +104,7 @@ install:
        -mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
 #      ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        ${INSTALL} -m 755 "libglite_lbutils_db.la" "${PREFIX}/lib/glite-lbutils-db.la"; \
-       ${INSTALL} -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
+       ${INSTALL} -m 644 ${top_srcdir}/interface/${HDRS} ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
 
 clean:
 

diff --git a/org.glite.lb-utils.db/build.xml b/org.glite.lb-utils.db/build.xml
index 32d03c4..14d4d7e 100644 (file)
--- a/org.glite.lb-utils.db/build.xml
+++ b/org.glite.lb-utils.db/build.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.1.1.1  2006/07/14 06:59:03  akrenek
+       module created
+
        Revision 1.7  2006/04/26 11:39:55  flammer
        Corrected wrong template syntax.
 
@@ -95,7 +98,7 @@
                 Load common targets
             ========================================= -->
        <!-- Put your language target (java/c++-ant/c++-autotool/perl) here -->
-       <!-- <import file="${global.targets-xxx.file}" /> -->
+       <import file="${global.targets-simple_make.file}" />
                
        <!-- =========================================
                 Load version file 
@@ -109,6 +112,7 @@
        
        <target name="localinit"
                description="Module specific initialization tasks">
+               <antcall target="lbmakefiles" />
        </target>
        
        <target name="localcompile"

diff --git a/org.glite.lb-utils.db/project/configure.properties.xml b/org.glite.lb-utils.db/project/configure.properties.xml
index e06563a..af94b53 100644 (file)
--- a/org.glite.lb-utils.db/project/configure.properties.xml
+++ b/org.glite.lb-utils.db/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
         Revision history:
         $Log$
+        Revision 1.1.1.1  2006/07/14 06:59:03  akrenek
+        module created
+
         Revision 1.3  2004/07/20 16:08:30  flammer
         Changed incorrect my_... instead of .._template entries for subsystem and component.
 
@@ -34,4 +37,42 @@
 -->
 <project name="lb-utils db component configuration properties">
 
+       <target name="lbmakefiles">
+               <exec executable="ln" failonerror="true">
+                       <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
+               </exec>
+               <echo file="${module.build.dir}/Makefile.inc">
+top_srcdir=..
+builddir=build
+stagedir=${stage.abs.dir}
+distdir=${dist.dir}
+globalprefix=${global.prefix}
+lbutilsprefix=${subsystem.prefix}
+package=${module.package.name}
+version=${module.version}
+PREFIX=${install.dir}
+
+glite_location=${with.glite.location}
+mysql_prefix=${with.mysql.prefix}
+mysql_version=${ext.mysql.version}
+cppunit_prefix=${with.cppunit.prefix}
+               </echo>
+               <echo file="${module.build.dir}/C.dox">
+PROJECT_NAME          = "Glite LB/JP Utils: Database Module"
+PROJECT_NUMBER        = ${module.version}
+OUTPUT_DIRECTORY      = ${component.dir}/doc/C
+OPTIMIZE_OUTPUT_FOR_C = YES
+INPUT                 = ../interface/db.h
+SHOW_DIRECTORIES       = NO
+FULL_PATH_NAMES        = NO
+EXTRACT_ALL            = YES
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = YES
+#PREDEFINED             = _EDG_WLL_EVENT_COMMON 
+HAVE_DOT               = NO
+               </echo>
+       </target>
+
 </project>

diff --git a/org.glite.lb-utils.db/project/tar_exclude b/org.glite.lb-utils.db/project/tar_exclude
new file mode 100644 (file)
index 0000000..e1fcd1a
--- /dev/null
+++ b/org.glite.lb-utils.db/project/tar_exclude
@@ -0,0 +1,10 @@
+tar_exclude
+CVS
+build.xml
+build
+build.properties
+properties.xml
+configure.properties.xml
+.cvsignore
+.project
+.cdtproject