first step to remove the ant dependency

diff --git a/org.glite.lb.client-interface/Makefile b/org.glite.lb.client-interface/Makefile
index ee12a59..3221b81 100644 (file)
--- a/org.glite.lb.client-interface/Makefile
+++ b/org.glite.lb.client-interface/Makefile
@@ -75,7 +75,8 @@ install: generate
        install -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
        cd ${top_srcdir}/interface && install -m 644 ${STATIC_H} ${PREFIX}/${STAGETO}
 ifndef LB_STANDALONE
-       cd ${top_srcdir}/doc && cp -r C CPP ${PREFIX}/share/doc/${package}-${version}
+       cp -r C CPP ${PREFIX}/share/doc/${package}-${version}
+#      cp -r ${top_srcdir}/doc/api/{Makefile,api.tex,fig} ${PREFIX}/share/doc/${package}-${version}/api
 endif
        if [ x${DOSTAGE} = xyes ]; then \
                cd ${top_srcdir}/interface && install -m 644 ${FAKE_H} ${PREFIX}/${STAGETO} ; \

diff --git a/org.glite.lb.client-interface/doc/C.dox b/org.glite.lb.client-interface/doc/C.dox
new file mode 100644 (file)
index 0000000..5ec7442
--- /dev/null
+++ b/org.glite.lb.client-interface/doc/C.dox
@@ -0,0 +1,19 @@
+PROJECT_NAME          = "Glite LB Client: C - Interface"
+OUTPUT_DIRECTORY      = C
+OPTIMIZE_OUTPUT_FOR_C = YES
+INPUT                 = ./events.h \
+                        ./jobstat.h \
+                        ./producer.h \
+                        ../interface/context.h \
+                        ../interface/notifid.h \
+                        ../interface/notification.h \
+                        ../interface/consumer.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

diff --git a/org.glite.lb.client-interface/doc/CPP.dox b/org.glite.lb.client-interface/doc/CPP.dox
new file mode 100644 (file)
index 0000000..1ee044c
--- /dev/null
+++ b/org.glite.lb.client-interface/doc/CPP.dox
@@ -0,0 +1,16 @@
+PROJECT_NAME           = "Glite LB Client: CPP - Interface"
+OUTPUT_DIRECTORY       = CPP
+INPUT                  = ../build/Event.h \
+                         ../build/JobStatus.h \
+                         ../interface/Job.h \
+                         ../interface/CountRef.h \
+                         ../interface/LoggingExceptions.h \
+                         ../interface/ServerConnection.h \
+                         ../interface/Notification.h
+SHOW_DIRECTORIES       = NO
+FULL_PATH_NAMES        = NO
+EXTRACT_ALL            = YES
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+#HAVE_DOT               = YES
+#CALL_GRAPH             = YES

diff --git a/org.glite.lb.client-interface/project/configure.properties.xml b/org.glite.lb.client-interface/project/configure.properties.xml
index 7145fd1..3bfacd0 100644 (file)
--- a/org.glite.lb.client-interface/project/configure.properties.xml
+++ b/org.glite.lb.client-interface/project/configure.properties.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.5  2005/08/03 09:30:10  akrenek
+       Merged the release 1.0 branch
+
        Revision 1.4  2005/02/25 09:37:43  mmulac
        generate doxygen doc for notification.h
        
@@ -83,46 +86,19 @@ lbprefix=${subsystem.prefix}
 PREFIX=${install.dir}
 version=${module.version}
                        </echo>
-                       <echo file="${module.build.dir}/C.dox">
-PROJECT_NAME          = "Glite LB Client: C - Interface"
+                       <copy file="${component.dir}/doc/C.dox" 
+                               tofile="${module.build.dir}/C.dox" 
+                               preservelastmodified="true"
+                               overwrite="true" />
+                       <copy file="${component.dir}/doc/CPP.dox" 
+                               tofile="${module.build.dir}/CPP.dox" 
+                               preservelastmodified="true"
+                               overwrite="true" />
+                       <echo file="${module.build.dir}/C.dox" append="true" >
 PROJECT_NUMBER        = ${module.version}
-OUTPUT_DIRECTORY      = ${component.dir}/doc/C
-OPTIMIZE_OUTPUT_FOR_C = YES
-INPUT                 = ./events.h \
-                        ./jobstat.h \
-                        ./producer.h \
-                        ../interface/context.h \
-                        ../interface/notifid.h \
-                        ../interface/notification.h \
-                        ../interface/consumer.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>
-                       <echo file="${module.build.dir}/CPP.dox">
-PROJECT_NAME           = "Glite LB Client: CPP - Interface"
+                       <echo file="${module.build.dir}/CPP.dox" append="true" >
 PROJECT_NUMBER         = ${module.version}
-OUTPUT_DIRECTORY       = ${component.dir}/doc/CPP
-INPUT                  = ../build/Event.h \
-                         ../build/JobStatus.h \
-                         ../interface/Job.h \
-                         ../interface/CountRef.h \
-                         ../interface/LoggingExceptions.h \
-                         ../interface/ServerConnection.h \
-                         ../interface/Notification.h
-SHOW_DIRECTORIES       = NO
-FULL_PATH_NAMES        = NO
-EXTRACT_ALL            = YES
-PDF_HYPERLINKS         = YES
-USE_PDFLATEX           = YES
-#HAVE_DOT               = YES
-#CALL_GRAPH             = YES
                        </echo>
            </target>
        </project>