Moved out JobIdExceptions.h cjobid.h JobId.h

Put in interface/glite/wmsutils/jobid

diff --git a/org.glite.wms-utils.jobid/Makefile.am b/org.glite.wms-utils.jobid/Makefile.am
index 7bda98d..e31fbb2 100755 (executable)
--- a/org.glite.wms-utils.jobid/Makefile.am
+++ b/org.glite.wms-utils.jobid/Makefile.am
@@ -9,7 +9,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Subdirectories list
-SUBDIRS = src examples 
+SUBDIRS = interface src examples 
 
 ## Default flags to run aclocal
 ACLOCAL_AMFLAGS = -I project

diff --git a/org.glite.wms-utils.jobid/configure.ac b/org.glite.wms-utils.jobid/configure.ac
index d552a04..92e8242 100755 (executable)
--- a/org.glite.wms-utils.jobid/configure.ac
+++ b/org.glite.wms-utils.jobid/configure.ac
@@ -19,6 +19,9 @@
 #
 #       Revision history:
 #       $Log$
+#       Revision 1.9  2004/08/17 10:40:34  eronchie
+#       Added optimize option
+#
 #       Revision 1.8  2004/07/27 09:14:19  eronchie
 #       Removed AC_WMSUTILS_EXCEPTION and AC_GLOBUS_SSL_UTILS checks
 #       Set directly exception library macro
@@ -98,6 +101,7 @@ AC_PREFIX_DEFAULT([/opt/glite])
 AM_CONFIG_HEADER([src/autogen/config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([examples/Makefile])
+AC_CONFIG_FILES([interface/Makefile])
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/jobid/Makefile])
 

diff --git a/org.glite.wms-utils.jobid/interface/Makefile.am b/org.glite.wms-utils.jobid/interface/Makefile.am
new file mode 100755 (executable)
index 0000000..136b352
--- /dev/null
+++ b/org.glite.wms-utils.jobid/interface/Makefile.am
@@ -0,0 +1,15 @@
+## *********************************************************************
+## *
+## * Copyright (c) 2002 CERN and INFN on behalf of the EU DataGrid.
+## * For license conditions see LICENSE file or
+## * http://www.edg.org/license.html
+## *
+## *********************************************************************
+
+jobiddir = $(includedir)
+nobase_jobid_HEADERS = \
+       glite/wmsutils/jobid/cjobid.h \
+       glite/wmsutils/jobid/JobIdExceptions.h \
+       glite/wmsutils/jobid/JobId.h
+
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/org.glite.wms-utils.jobid/src/jobid/JobId.h b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h
similarity index 98%
rename from org.glite.wms-utils.jobid/src/jobid/JobId.h
rename to org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h
index a89b9c4..f7c1bb5 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/JobId.h
+++ b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <iosfwd>
 
-#include "cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 
 typedef struct _edg_wlc_jobid_s* edg_wlc_jobid_t;
 

diff --git a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobIdExceptions.h
similarity index 100%
rename from org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.h
rename to org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobIdExceptions.h

diff --git a/org.glite.wms-utils.jobid/src/jobid/cjobid.h b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/cjobid.h
similarity index 100%
rename from org.glite.wms-utils.jobid/src/jobid/cjobid.h
rename to org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/cjobid.h

diff --git a/org.glite.wms-utils.jobid/src/jobid/JobId.cpp b/org.glite.wms-utils.jobid/src/jobid/JobId.cpp
index 6bba755..273f9f9 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/JobId.cpp
+++ b/org.glite.wms-utils.jobid/src/jobid/JobId.cpp
@@ -4,11 +4,11 @@
  *  copyright : (C) 2002 by DATAMAT
  ***************************************************************************/
 
-#include "JobId.h"
+#include "glite/wmsutils/jobid/JobId.h"
 
 #include <iostream>
 
-#include "JobIdExceptions.h"
+#include "glite/wmsutils/jobid/JobIdExceptions.h"
 
 namespace glite {
 namespace wmsutils {

diff --git a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp
index 1c1fb19..6be40b7 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp
+++ b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp
@@ -4,7 +4,7 @@
 *  copyright : (C) 2002 by DATAMAT
 ***************************************************************************/
 
-#include "JobIdExceptions.h"
+#include "glite/wmsutils/jobid/JobIdExceptions.h"
 
 namespace glite {
 namespace wmsutils {

diff --git a/org.glite.wms-utils.jobid/src/jobid/Makefile.am b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
index 7bf3d08..33c9da6 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/Makefile.am
+++ b/org.glite.wms-utils.jobid/src/jobid/Makefile.am
@@ -19,9 +19,6 @@ libglite_wmsutils_cjobid_la_SOURCES = \
 
 jobidincludedir = $(includedir)/glite/wmsutils/jobid
 jobidinclude_HEADERS = \
-       JobId.h \
-       JobIdExceptions.h \
-       cjobid.h \
        manipulation.h \
        strmd5.h 
 

diff --git a/org.glite.wms-utils.jobid/src/jobid/cjobid.c b/org.glite.wms-utils.jobid/src/jobid/cjobid.c
index dcb30f6..2fa0010 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/cjobid.c
+++ b/org.glite.wms-utils.jobid/src/jobid/cjobid.c
@@ -10,7 +10,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "strmd5.h"
 
 struct _edg_wlc_JobId {

diff --git a/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp b/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp
index 4df8420..cf3a710 100755 (executable)
--- a/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp
+++ b/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <algorithm>
 
-#include "JobId.h"
+#include "glite/wmsutils/jobid/JobId.h"
 
 using namespace std;