bin/CMakeLists.txt

CMakeCache.txt.tmp
Makefile.tmp
cmake_install.cmake.tmp
cmake_install.cmake
bin/Makefile.tmp
bin/cmake_install.cmake.tmp
bin/cmake_install.cmake
bin/CMakeFiles/CMakeDirectoryInformation.cmake.tmp
bin/CMakeFiles/progress.marks.tmp
bin/CMakeFiles/progress.marks
bin/CMakeFiles/roojspacker-vala.dir/build.make.tmp
bin/CMakeFiles/roojspacker-vala.dir/cmake_clean.cmake
bin/CMakeFiles/roojspacker-vala.dir/DependInfo.cmake.tmp
bin/CMakeFiles/roojspacker-vala.dir/build.make
bin/CMakeFiles/roojspacker-vala.dir/progress.make.tmp
bin/CMakeFiles/roojspacker-vala.dir/progress.make
bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/build.make.tmp
bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/cmake_clean.cmake
bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/DependInfo.cmake.tmp
bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/build.make
bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/progress.make.tmp
bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/progress.make
bin/CMakeFiles/roojspacker.dir/build.make.tmp
bin/CMakeFiles/roojspacker.dir/flags.make.tmp
bin/CMakeFiles/roojspacker.dir/link.txt.tmp
bin/CMakeFiles/roojspacker.dir/link.txt
bin/CMakeFiles/roojspacker.dir/cmake_clean.cmake
bin/CMakeFiles/roojspacker.dir/DependInfo.cmake.tmp
bin/CMakeFiles/roojspacker.dir/build.make
bin/CMakeFiles/roojspacker.dir/DependInfo.cmake
bin/CMakeFiles/roojspacker.dir/flags.make
bin/CMakeFiles/roojspacker.dir/progress.make.tmp
bin/CMakeFiles/roojspacker.dir/progress.make

diff --git a/bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/build.make b/bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/build.make
index e25ab94..c9fd66e 100644 (file)
--- a/bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/build.make
+++ b/bin/CMakeFiles/roojspacker-vala-fast-vapis.dir/build.make
@@ -61,9 +61,9 @@ bin/roojspacker-vala/fast-vapis.stamp: bin/roojspacker-vala/build/bin/main.vapi.
        cd /home/alan/gitlive/roojspacker/bin && /usr/bin/cmake -E touch /home/alan/gitlive/roojspacker/bin/roojspacker-vala/fast-vapis.stamp
 
 bin/roojspacker-vala/build/bin/main.vapi.stamp: bin/main.vala
-bin/roojspacker-vala/build/bin/main.vapi.stamp: jsdoc/roojspacker-1.2.vapi
+bin/roojspacker-vala/build/bin/main.vapi.stamp: roojspacker/roojspacker-1.2.vapi
        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/alan/gitlive/roojspacker/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Generating fast VAPI /home/alan/gitlive/roojspacker/bin/roojspacker-vala/build/bin/main.vapi"
-       cd /home/alan/gitlive/roojspacker/bin && /usr/bin/valac /home/alan/gitlive/roojspacker/bin/main.vala --fast-vapi /home/alan/gitlive/roojspacker/bin/roojspacker-vala/build/bin/main.vapi /home/alan/gitlive/roojspacker/jsdoc/roojspacker-1.2.vapi --target-glib=2.38 -g --thread --vapidir=/home/alan/gitlive/roojspacker/vapi
+       cd /home/alan/gitlive/roojspacker/bin && /usr/bin/valac /home/alan/gitlive/roojspacker/bin/main.vala --fast-vapi /home/alan/gitlive/roojspacker/bin/roojspacker-vala/build/bin/main.vapi /home/alan/gitlive/roojspacker/roojspacker/roojspacker-1.2.vapi --target-glib=2.38 -g --thread --vapidir=/home/alan/gitlive/roojspacker/vapi
        cd /home/alan/gitlive/roojspacker/bin && /usr/bin/cmake -E touch /home/alan/gitlive/roojspacker/bin/roojspacker-vala/build/bin/main.vapi.stamp
 
 roojspacker-vala-fast-vapis: bin/CMakeFiles/roojspacker-vala-fast-vapis

diff --git a/bin/CMakeFiles/roojspacker-vala.dir/build.make b/bin/CMakeFiles/roojspacker-vala.dir/build.make
index 227567b..b0176ea 100644 (file)
--- a/bin/CMakeFiles/roojspacker-vala.dir/build.make
+++ b/bin/CMakeFiles/roojspacker-vala.dir/build.make
@@ -62,9 +62,9 @@ bin/roojspacker-vala/stamp: bin/roojspacker-vala/build/bin/main.c.stamp
        cd /home/alan/gitlive/roojspacker/bin && /usr/bin/cmake -E touch /home/alan/gitlive/roojspacker/bin/roojspacker-vala/stamp
 
 bin/roojspacker-vala/build/bin/main.c.stamp: bin/main.vala
-bin/roojspacker-vala/build/bin/main.c.stamp: jsdoc/roojspacker-1.2.vapi
+bin/roojspacker-vala/build/bin/main.c.stamp: roojspacker/roojspacker-1.2.vapi
        @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/home/alan/gitlive/roojspacker/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Generating /home/alan/gitlive/roojspacker/bin/roojspacker-vala/build/bin/main.c"
-       cd /home/alan/gitlive/roojspacker/bin && /usr/bin/valac -d /home/alan/gitlive/roojspacker/bin/roojspacker-vala/build/bin -C /home/alan/gitlive/roojspacker/bin/main.vala /home/alan/gitlive/roojspacker/jsdoc/roojspacker-1.2.vapi --target-glib=2.38 -g --thread --vapidir=/home/alan/gitlive/roojspacker/vapi
+       cd /home/alan/gitlive/roojspacker/bin && /usr/bin/valac -d /home/alan/gitlive/roojspacker/bin/roojspacker-vala/build/bin -C /home/alan/gitlive/roojspacker/bin/main.vala /home/alan/gitlive/roojspacker/roojspacker/roojspacker-1.2.vapi --target-glib=2.38 -g --thread --vapidir=/home/alan/gitlive/roojspacker/vapi
        cd /home/alan/gitlive/roojspacker/bin && /usr/bin/cmake -E touch /home/alan/gitlive/roojspacker/bin/roojspacker-vala/build/bin/main.c.stamp
 
 roojspacker-vala: bin/CMakeFiles/roojspacker-vala

diff --git a/bin/CMakeFiles/roojspacker.dir/DependInfo.cmake b/bin/CMakeFiles/roojspacker.dir/DependInfo.cmake
index 9ce0469..ae8ce9e 100644 (file)
--- a/bin/CMakeFiles/roojspacker.dir/DependInfo.cmake
+++ b/bin/CMakeFiles/roojspacker.dir/DependInfo.cmake
@@ -10,12 +10,12 @@ set(CMAKE_C_COMPILER_ID "GNU")
 
 # The include file search paths:
 set(CMAKE_C_TARGET_INCLUDE_PATH
-  "jsdoc"
+  "roojspacker"
   )
 
 # Targets to which this target links.
 set(CMAKE_TARGET_LINKED_INFO_FILES
-  "/home/alan/gitlive/roojspacker/jsdoc/CMakeFiles/roojspacker-.dir/DependInfo.cmake"
+  "/home/alan/gitlive/roojspacker/roojspacker/CMakeFiles/roojspacker-.dir/DependInfo.cmake"
   )
 
 # Fortran module output directory.

diff --git a/bin/CMakeFiles/roojspacker.dir/build.make b/bin/CMakeFiles/roojspacker.dir/build.make
index 22ac06a..03a009b 100644 (file)
--- a/bin/CMakeFiles/roojspacker.dir/build.make
+++ b/bin/CMakeFiles/roojspacker.dir/build.make
@@ -79,7 +79,7 @@ roojspacker_EXTERNAL_OBJECTS =
 
 bin/roojspacker: bin/CMakeFiles/roojspacker.dir/roojspacker-vala/build/bin/main.c.o
 bin/roojspacker: bin/CMakeFiles/roojspacker.dir/build.make
-bin/roojspacker: jsdoc/libroojspacker-.so.1.2
+bin/roojspacker: roojspacker/libroojspacker-.so.1.2
 bin/roojspacker: /usr/lib/x86_64-linux-gnu/libgobject-2.0.so
 bin/roojspacker: /usr/lib/x86_64-linux-gnu/libglib-2.0.so
 bin/roojspacker: /usr/lib/x86_64-linux-gnu/libgio-2.0.so

diff --git a/bin/CMakeFiles/roojspacker.dir/flags.make b/bin/CMakeFiles/roojspacker.dir/flags.make
index 544324b..43f677c 100644 (file)
--- a/bin/CMakeFiles/roojspacker.dir/flags.make
+++ b/bin/CMakeFiles/roojspacker.dir/flags.make
@@ -6,5 +6,5 @@ C_FLAGS =  -Wno-incompatible-pointer-types -g   -I/usr/include/glib-2.0 -I/usr/l
 
 C_DEFINES = 
 
-C_INCLUDES = -I/home/alan/gitlive/roojspacker/jsdoc 
+C_INCLUDES = -I/home/alan/gitlive/roojspacker/roojspacker 
 

diff --git a/bin/CMakeFiles/roojspacker.dir/link.txt b/bin/CMakeFiles/roojspacker.dir/link.txt
index 90ddb38..da08a2f 100644 (file)
--- a/bin/CMakeFiles/roojspacker.dir/link.txt
+++ b/bin/CMakeFiles/roojspacker.dir/link.txt
@@ -1 +1 @@
-/usr/bin/cc  -Wno-incompatible-pointer-types -g  -rdynamic CMakeFiles/roojspacker.dir/roojspacker-vala/build/bin/main.c.o  -o roojspacker -Wl,-rpath,/home/alan/gitlive/roojspacker/jsdoc: -lgee-0.8 -lgthread-2.0 -ljson-glib-1.0 ../jsdoc/libroojspacker-.so.1.2 /usr/lib/x86_64-linux-gnu/libgobject-2.0.so /usr/lib/x86_64-linux-gnu/libglib-2.0.so /usr/lib/x86_64-linux-gnu/libgio-2.0.so -lgee-0.8 -lgthread-2.0 -ljson-glib-1.0 
+/usr/bin/cc  -Wno-incompatible-pointer-types -g  -rdynamic CMakeFiles/roojspacker.dir/roojspacker-vala/build/bin/main.c.o  -o roojspacker -Wl,-rpath,/home/alan/gitlive/roojspacker/roojspacker: -lgee-0.8 -lgthread-2.0 -ljson-glib-1.0 ../roojspacker/libroojspacker-.so.1.2 /usr/lib/x86_64-linux-gnu/libgobject-2.0.so /usr/lib/x86_64-linux-gnu/libglib-2.0.so /usr/lib/x86_64-linux-gnu/libgio-2.0.so -lgee-0.8 -lgthread-2.0 -ljson-glib-1.0 

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 89b59e9..22c305d 100644 (file)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -10,7 +10,7 @@ set(ROOJSPACKER_MAIN_SOURCES
 vala_precompile_target(
   "${PROJECT_NAME}-vala"
   ROOJSPACKER_MAIN_SOURCES
-  ${CMAKE_BINARY_DIR}/jsdoc/roojspacker-${ROOJSPACKER_VERSION_API}.vapi
+  ${CMAKE_BINARY_DIR}/roojspacker/roojspacker-${ROOJSPACKER_VERSION_API}.vapi
   main.vala
   DEPENDS "${ROOJSPACKER_LIBRARY_NAME}-vala")
 
@@ -25,7 +25,7 @@ add_dependencies("${PROJECT_NAME}" "${PROJECT_NAME}-vala")
 # We need to add the directory where the C header for our library is
 # installed, otherwise we'll get an error from the C compiler.
 set_target_properties(${PROJECT_NAME} PROPERTIES
-       INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/jsdoc)
+       INCLUDE_DIRECTORIES ${CMAKE_BINARY_DIR}/roojspacker)
 
 # Any libraries that your tests need to link to should go here.
 # Usually this will just be your library.

diff --git a/bin/cmake_install.cmake b/bin/cmake_install.cmake
index 27d8036..105f745 100644 (file)
--- a/bin/cmake_install.cmake
+++ b/bin/cmake_install.cmake
@@ -49,7 +49,7 @@ if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_
      NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/roojspacker")
     file(RPATH_CHANGE
          FILE "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/roojspacker"
-         OLD_RPATH "/home/alan/gitlive/roojspacker/jsdoc:"
+         OLD_RPATH "/home/alan/gitlive/roojspacker/roojspacker:"
          NEW_RPATH "")
     if(CMAKE_INSTALL_DO_STRIP)
       execute_process(COMMAND "/usr/bin/strip" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/roojspacker")

diff --git a/cmake_install.cmake b/cmake_install.cmake
index b5787b7..cf014e8 100644 (file)
--- a/cmake_install.cmake
+++ b/cmake_install.cmake
@@ -39,7 +39,7 @@ endif()
 
 if(NOT CMAKE_INSTALL_LOCAL_ONLY)
   # Include the install script for each subdirectory.
-  include("/home/alan/gitlive/roojspacker/jsdoc/cmake_install.cmake")
+  include("/home/alan/gitlive/roojspacker/roojspacker/cmake_install.cmake")
   include("/home/alan/gitlive/roojspacker/bin/cmake_install.cmake")
 
 endif()