diff -u -r1.73 -r1.74
--- CMakeLists.txt	25 Jun 2010 11:03:24 -0000	1.73
+++ CMakeLists.txt	28 Jun 2010 13:52:49 -0000	1.74
@@ -129,6 +129,9 @@

 #    ENDIF()
 #ENDIF()
 

+SET( LCIO_AID_HEADERS_DIR "${LCIO_SOURCE_DIR}/src/aid" )
+SET( LCIO_CXX_HEADERS_DIR "${LCIO_SOURCE_DIR}/src/cpp/include" )
+SET( AID_GEN_CXX_HEADERS_DIR "${LCIO_BINARY_DIR}/include" )

 
 # add custom target for building all documentation
 ADD_CUSTOM_TARGET( doc )

@@ -176,6 +179,10 @@

     # create "always out-of-date" jar target
     ADD_CUSTOM_TARGET( jar
         COMMAND ${SH} "${LCIO_ENV_INIT}" ant aid

+        COMMAND ${CMAKE_COMMAND} -E remove_directory
+        "${LCIO_CXX_HEADERS_DIR}/EVENT"
+        COMMAND ${CMAKE_COMMAND} -E remove_directory
+        "${LCIO_CXX_HEADERS_DIR}/IO"

         WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
         COMMENT "Building lcio jar library..."
         VERBATIM )

@@ -194,7 +201,7 @@

 
     # unfortunately this does not work with *.java
     #SET_DIRECTORY_PROPERTIES( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES

-    #    "${PROJECT_SOURCE_DIR}/src/java/hep/lcio/event/*java;${PROJECT_SOURCE_DIR}/src/java/hep/lcio/io"

+    #    "${PROJECT_SOURCE_DIR}/src/java/hep/lcio/event/*java;${PROJECT_SOURCE_DIR}/src/java/hep/lcio/io/*java"

     #)
 
     #JAVADOC

@@ -363,11 +370,6 @@

   LINK_LIBRARIES( ${DCAP_LIB} ) 
 ENDIF()
 

-SET( LCIO_AID_HEADERS_DIR "${LCIO_SOURCE_DIR}/src/aid" )
-SET( LCIO_CXX_HEADERS_DIR "${LCIO_SOURCE_DIR}/src/cpp/include" )
-SET( AID_GEN_CXX_HEADERS_DIR "${LCIO_BINARY_DIR}/include" )
-SET_DIRECTORY_PROPERTIES( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${AID_GEN_CXX_HEADERS_DIR}" )
-

 ADD_SUBDIRECTORY( sio sio )
 ADD_SUBDIRECTORY( src/cpp lcio )
 IF( BUILD_ROOTDICT )