move include files to agg subdir

cppfw · Nov 26, 2024 · bad34cf · bad34cf
1 parent 4b9b889
commit bad34cf
Show file tree

Hide file tree

Showing 153 changed files with 9 additions and 9 deletions.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -27,7 +27,7 @@ target_include_directories(
         $<BUILD_INTERFACE:>
         $<INSTALL_INTERFACE:include>
     PRIVATE
-        "${CMAKE_CURRENT_SOURCE_DIR}/../src/${name}/include/"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../src/${name}/include/${name}"
 )
 
 # target_link_libraries(
@@ -39,7 +39,7 @@ target_include_directories(
 # install library header files preserving directory hierarchy
 install(
     DIRECTORY
-        "${CMAKE_CURRENT_SOURCE_DIR}/../include/${name}"
+        "${CMAKE_CURRENT_SOURCE_DIR}/../src/${name}/include/${name}"
     DESTINATION
         "${CMAKE_INSTALL_INCLUDEDIR}"
     FILES_MATCHING PATTERN

diff --git a/include b/include
@@ -0,0 +1 @@
+src/agg/include/
diff --git a/include/agg b/include/agg
diff --git a/src/agg/include/Makefile.am → src/agg/include/agg/Makefile.am b/src/agg/include/Makefile.am → src/agg/include/agg/Makefile.am
diff --git a/src/agg/include/agg_alpha_mask_u8.h → src/agg/include/agg/agg_alpha_mask_u8.h b/src/agg/include/agg_alpha_mask_u8.h → src/agg/include/agg/agg_alpha_mask_u8.h
diff --git a/src/agg/include/agg_arc.h → src/agg/include/agg/agg_arc.h b/src/agg/include/agg_arc.h → src/agg/include/agg/agg_arc.h
diff --git a/src/agg/include/agg_array.h → src/agg/include/agg/agg_array.h b/src/agg/include/agg_array.h → src/agg/include/agg/agg_array.h
diff --git a/src/agg/include/agg_arrowhead.h → src/agg/include/agg/agg_arrowhead.h b/src/agg/include/agg_arrowhead.h → src/agg/include/agg/agg_arrowhead.h
diff --git a/src/agg/include/agg_basics.h → src/agg/include/agg/agg_basics.h b/src/agg/include/agg_basics.h → src/agg/include/agg/agg_basics.h
diff --git a/src/agg/include/agg_bezier_arc.h → src/agg/include/agg/agg_bezier_arc.h b/src/agg/include/agg_bezier_arc.h → src/agg/include/agg/agg_bezier_arc.h
diff --git a/src/agg/include/agg_bitset_iterator.h → src/agg/include/agg/agg_bitset_iterator.h b/src/agg/include/agg_bitset_iterator.h → src/agg/include/agg/agg_bitset_iterator.h
diff --git a/src/agg/include/agg_blur.h → src/agg/include/agg/agg_blur.h b/src/agg/include/agg_blur.h → src/agg/include/agg/agg_blur.h
diff --git a/src/agg/include/agg_bounding_rect.h → src/agg/include/agg/agg_bounding_rect.h b/src/agg/include/agg_bounding_rect.h → src/agg/include/agg/agg_bounding_rect.h
diff --git a/src/agg/include/agg_bspline.h → src/agg/include/agg/agg_bspline.h b/src/agg/include/agg_bspline.h → src/agg/include/agg/agg_bspline.h
diff --git a/src/agg/include/agg_clip_liang_barsky.h → src/agg/include/agg/agg_clip_liang_barsky.h b/src/agg/include/agg_clip_liang_barsky.h → src/agg/include/agg/agg_clip_liang_barsky.h
diff --git a/src/agg/include/agg_color_gray.h → src/agg/include/agg/agg_color_gray.h b/src/agg/include/agg_color_gray.h → src/agg/include/agg/agg_color_gray.h
diff --git a/src/agg/include/agg_color_rgba.h → src/agg/include/agg/agg_color_rgba.h b/src/agg/include/agg_color_rgba.h → src/agg/include/agg/agg_color_rgba.h
diff --git a/src/agg/include/agg_config.h → src/agg/include/agg/agg_config.h b/src/agg/include/agg_config.h → src/agg/include/agg/agg_config.h
diff --git a/src/agg/include/agg_conv_adaptor_vcgen.h → src/agg/include/agg/agg_conv_adaptor_vcgen.h b/src/agg/include/agg_conv_adaptor_vcgen.h → src/agg/include/agg/agg_conv_adaptor_vcgen.h
diff --git a/src/agg/include/agg_conv_adaptor_vpgen.h → src/agg/include/agg/agg_conv_adaptor_vpgen.h b/src/agg/include/agg_conv_adaptor_vpgen.h → src/agg/include/agg/agg_conv_adaptor_vpgen.h
diff --git a/src/agg/include/agg_conv_bspline.h → src/agg/include/agg/agg_conv_bspline.h b/src/agg/include/agg_conv_bspline.h → src/agg/include/agg/agg_conv_bspline.h
diff --git a/src/agg/include/agg_conv_clip_polygon.h → src/agg/include/agg/agg_conv_clip_polygon.h b/src/agg/include/agg_conv_clip_polygon.h → src/agg/include/agg/agg_conv_clip_polygon.h
diff --git a/src/agg/include/agg_conv_clip_polyline.h → src/agg/include/agg/agg_conv_clip_polyline.h b/src/agg/include/agg_conv_clip_polyline.h → src/agg/include/agg/agg_conv_clip_polyline.h
diff --git a/src/agg/include/agg_conv_close_polygon.h → src/agg/include/agg/agg_conv_close_polygon.h b/src/agg/include/agg_conv_close_polygon.h → src/agg/include/agg/agg_conv_close_polygon.h
diff --git a/src/agg/include/agg_conv_concat.h → src/agg/include/agg/agg_conv_concat.h b/src/agg/include/agg_conv_concat.h → src/agg/include/agg/agg_conv_concat.h
diff --git a/src/agg/include/agg_conv_contour.h → src/agg/include/agg/agg_conv_contour.h b/src/agg/include/agg_conv_contour.h → src/agg/include/agg/agg_conv_contour.h
diff --git a/src/agg/include/agg_conv_curve.h → src/agg/include/agg/agg_conv_curve.h b/src/agg/include/agg_conv_curve.h → src/agg/include/agg/agg_conv_curve.h
diff --git a/src/agg/include/agg_conv_dash.h → src/agg/include/agg/agg_conv_dash.h b/src/agg/include/agg_conv_dash.h → src/agg/include/agg/agg_conv_dash.h
diff --git a/src/agg/include/agg_conv_gpc.h → src/agg/include/agg/agg_conv_gpc.h b/src/agg/include/agg_conv_gpc.h → src/agg/include/agg/agg_conv_gpc.h
diff --git a/src/agg/include/agg_conv_marker.h → src/agg/include/agg/agg_conv_marker.h b/src/agg/include/agg_conv_marker.h → src/agg/include/agg/agg_conv_marker.h
diff --git a/src/agg/include/agg_conv_marker_adaptor.h → ...agg/include/agg/agg_conv_marker_adaptor.h b/src/agg/include/agg_conv_marker_adaptor.h → ...agg/include/agg/agg_conv_marker_adaptor.h
diff --git a/src/agg/include/agg_conv_segmentator.h → src/agg/include/agg/agg_conv_segmentator.h b/src/agg/include/agg_conv_segmentator.h → src/agg/include/agg/agg_conv_segmentator.h
diff --git a/src/agg/include/agg_conv_shorten_path.h → src/agg/include/agg/agg_conv_shorten_path.h b/src/agg/include/agg_conv_shorten_path.h → src/agg/include/agg/agg_conv_shorten_path.h
diff --git a/src/agg/include/agg_conv_smooth_poly1.h → src/agg/include/agg/agg_conv_smooth_poly1.h b/src/agg/include/agg_conv_smooth_poly1.h → src/agg/include/agg/agg_conv_smooth_poly1.h
diff --git a/src/agg/include/agg_conv_stroke.h → src/agg/include/agg/agg_conv_stroke.h b/src/agg/include/agg_conv_stroke.h → src/agg/include/agg/agg_conv_stroke.h
diff --git a/src/agg/include/agg_conv_transform.h → src/agg/include/agg/agg_conv_transform.h b/src/agg/include/agg_conv_transform.h → src/agg/include/agg/agg_conv_transform.h
diff --git a/src/agg/include/agg_conv_unclose_polygon.h → ...gg/include/agg/agg_conv_unclose_polygon.h b/src/agg/include/agg_conv_unclose_polygon.h → ...gg/include/agg/agg_conv_unclose_polygon.h
diff --git a/src/agg/include/agg_curves.h → src/agg/include/agg/agg_curves.h b/src/agg/include/agg_curves.h → src/agg/include/agg/agg_curves.h
diff --git a/src/agg/include/agg_dda_line.h → src/agg/include/agg/agg_dda_line.h b/src/agg/include/agg_dda_line.h → src/agg/include/agg/agg_dda_line.h
diff --git a/src/agg/include/agg_ellipse.h → src/agg/include/agg/agg_ellipse.h b/src/agg/include/agg_ellipse.h → src/agg/include/agg/agg_ellipse.h
diff --git a/src/agg/include/agg_ellipse_bresenham.h → src/agg/include/agg/agg_ellipse_bresenham.h b/src/agg/include/agg_ellipse_bresenham.h → src/agg/include/agg/agg_ellipse_bresenham.h
diff --git a/src/agg/include/agg_embedded_raster_fonts.h → ...g/include/agg/agg_embedded_raster_fonts.h b/src/agg/include/agg_embedded_raster_fonts.h → ...g/include/agg/agg_embedded_raster_fonts.h
diff --git a/src/agg/include/agg_font_cache_manager.h → src/agg/include/agg/agg_font_cache_manager.h b/src/agg/include/agg_font_cache_manager.h → src/agg/include/agg/agg_font_cache_manager.h
diff --git a/src/agg/include/agg_font_cache_manager2.h → ...agg/include/agg/agg_font_cache_manager2.h b/src/agg/include/agg_font_cache_manager2.h → ...agg/include/agg/agg_font_cache_manager2.h
diff --git a/src/agg/include/agg_gamma_functions.h → src/agg/include/agg/agg_gamma_functions.h b/src/agg/include/agg_gamma_functions.h → src/agg/include/agg/agg_gamma_functions.h
diff --git a/src/agg/include/agg_gamma_lut.h → src/agg/include/agg/agg_gamma_lut.h b/src/agg/include/agg_gamma_lut.h → src/agg/include/agg/agg_gamma_lut.h
diff --git a/src/agg/include/agg_glyph_raster_bin.h → src/agg/include/agg/agg_glyph_raster_bin.h b/src/agg/include/agg_glyph_raster_bin.h → src/agg/include/agg/agg_glyph_raster_bin.h
diff --git a/src/agg/include/agg_gradient_lut.h → src/agg/include/agg/agg_gradient_lut.h b/src/agg/include/agg_gradient_lut.h → src/agg/include/agg/agg_gradient_lut.h
diff --git a/src/agg/include/agg_gsv_text.h → src/agg/include/agg/agg_gsv_text.h b/src/agg/include/agg_gsv_text.h → src/agg/include/agg/agg_gsv_text.h
diff --git a/src/agg/include/agg_image_accessors.h → src/agg/include/agg/agg_image_accessors.h b/src/agg/include/agg_image_accessors.h → src/agg/include/agg/agg_image_accessors.h
diff --git a/src/agg/include/agg_image_filters.h → src/agg/include/agg/agg_image_filters.h b/src/agg/include/agg_image_filters.h → src/agg/include/agg/agg_image_filters.h
diff --git a/src/agg/include/agg_line_aa_basics.h → src/agg/include/agg/agg_line_aa_basics.h b/src/agg/include/agg_line_aa_basics.h → src/agg/include/agg/agg_line_aa_basics.h
diff --git a/src/agg/include/agg_math.h → src/agg/include/agg/agg_math.h b/src/agg/include/agg_math.h → src/agg/include/agg/agg_math.h
diff --git a/src/agg/include/agg_math_stroke.h → src/agg/include/agg/agg_math_stroke.h b/src/agg/include/agg_math_stroke.h → src/agg/include/agg/agg_math_stroke.h
diff --git a/src/agg/include/agg_path_length.h → src/agg/include/agg/agg_path_length.h b/src/agg/include/agg_path_length.h → src/agg/include/agg/agg_path_length.h
diff --git a/src/agg/include/agg_path_storage.h → src/agg/include/agg/agg_path_storage.h b/src/agg/include/agg_path_storage.h → src/agg/include/agg/agg_path_storage.h
diff --git a/src/agg/include/agg_path_storage_integer.h → ...gg/include/agg/agg_path_storage_integer.h b/src/agg/include/agg_path_storage_integer.h → ...gg/include/agg/agg_path_storage_integer.h
diff --git a/src/agg/include/agg_pattern_filters_rgba.h → ...gg/include/agg/agg_pattern_filters_rgba.h b/src/agg/include/agg_pattern_filters_rgba.h → ...gg/include/agg/agg_pattern_filters_rgba.h
diff --git a/src/agg/include/agg_pixfmt_amask_adaptor.h → ...gg/include/agg/agg_pixfmt_amask_adaptor.h b/src/agg/include/agg_pixfmt_amask_adaptor.h → ...gg/include/agg/agg_pixfmt_amask_adaptor.h
diff --git a/src/agg/include/agg_pixfmt_base.h → src/agg/include/agg/agg_pixfmt_base.h b/src/agg/include/agg_pixfmt_base.h → src/agg/include/agg/agg_pixfmt_base.h
diff --git a/src/agg/include/agg_pixfmt_gray.h → src/agg/include/agg/agg_pixfmt_gray.h b/src/agg/include/agg_pixfmt_gray.h → src/agg/include/agg/agg_pixfmt_gray.h
diff --git a/src/agg/include/agg_pixfmt_rgb.h → src/agg/include/agg/agg_pixfmt_rgb.h b/src/agg/include/agg_pixfmt_rgb.h → src/agg/include/agg/agg_pixfmt_rgb.h
diff --git a/src/agg/include/agg_pixfmt_rgb_packed.h → src/agg/include/agg/agg_pixfmt_rgb_packed.h b/src/agg/include/agg_pixfmt_rgb_packed.h → src/agg/include/agg/agg_pixfmt_rgb_packed.h
diff --git a/src/agg/include/agg_pixfmt_rgba.h → src/agg/include/agg/agg_pixfmt_rgba.h b/src/agg/include/agg_pixfmt_rgba.h → src/agg/include/agg/agg_pixfmt_rgba.h
diff --git a/src/agg/include/agg_pixfmt_transposer.h → src/agg/include/agg/agg_pixfmt_transposer.h b/src/agg/include/agg_pixfmt_transposer.h → src/agg/include/agg/agg_pixfmt_transposer.h
diff --git a/src/agg/include/agg_rasterizer_cells_aa.h → ...agg/include/agg/agg_rasterizer_cells_aa.h b/src/agg/include/agg_rasterizer_cells_aa.h → ...agg/include/agg/agg_rasterizer_cells_aa.h
diff --git a/src/agg/include/agg_rasterizer_compound_aa.h → .../include/agg/agg_rasterizer_compound_aa.h b/src/agg/include/agg_rasterizer_compound_aa.h → .../include/agg/agg_rasterizer_compound_aa.h
diff --git a/src/agg/include/agg_rasterizer_outline.h → src/agg/include/agg/agg_rasterizer_outline.h b/src/agg/include/agg_rasterizer_outline.h → src/agg/include/agg/agg_rasterizer_outline.h
diff --git a/src/agg/include/agg_rasterizer_outline_aa.h → ...g/include/agg/agg_rasterizer_outline_aa.h b/src/agg/include/agg_rasterizer_outline_aa.h → ...g/include/agg/agg_rasterizer_outline_aa.h
diff --git a/src/agg/include/agg_rasterizer_scanline_aa.h → .../include/agg/agg_rasterizer_scanline_aa.h b/src/agg/include/agg_rasterizer_scanline_aa.h → .../include/agg/agg_rasterizer_scanline_aa.h
diff --git a/...lude/agg_rasterizer_scanline_aa_nogamma.h → .../agg/agg_rasterizer_scanline_aa_nogamma.h b/...lude/agg_rasterizer_scanline_aa_nogamma.h → .../agg/agg_rasterizer_scanline_aa_nogamma.h
diff --git a/src/agg/include/agg_rasterizer_sl_clip.h → src/agg/include/agg/agg_rasterizer_sl_clip.h b/src/agg/include/agg_rasterizer_sl_clip.h → src/agg/include/agg/agg_rasterizer_sl_clip.h
diff --git a/src/agg/include/agg_renderer_base.h → src/agg/include/agg/agg_renderer_base.h b/src/agg/include/agg_renderer_base.h → src/agg/include/agg/agg_renderer_base.h
diff --git a/src/agg/include/agg_renderer_markers.h → src/agg/include/agg/agg_renderer_markers.h b/src/agg/include/agg_renderer_markers.h → src/agg/include/agg/agg_renderer_markers.h
diff --git a/src/agg/include/agg_renderer_mclip.h → src/agg/include/agg/agg_renderer_mclip.h b/src/agg/include/agg_renderer_mclip.h → src/agg/include/agg/agg_renderer_mclip.h
diff --git a/src/agg/include/agg_renderer_outline_aa.h → ...agg/include/agg/agg_renderer_outline_aa.h b/src/agg/include/agg_renderer_outline_aa.h → ...agg/include/agg/agg_renderer_outline_aa.h
diff --git a/src/agg/include/agg_renderer_outline_image.h → .../include/agg/agg_renderer_outline_image.h b/src/agg/include/agg_renderer_outline_image.h → .../include/agg/agg_renderer_outline_image.h
diff --git a/src/agg/include/agg_renderer_primitives.h → ...agg/include/agg/agg_renderer_primitives.h b/src/agg/include/agg_renderer_primitives.h → ...agg/include/agg/agg_renderer_primitives.h
diff --git a/src/agg/include/agg_renderer_raster_text.h → ...gg/include/agg/agg_renderer_raster_text.h b/src/agg/include/agg_renderer_raster_text.h → ...gg/include/agg/agg_renderer_raster_text.h
diff --git a/src/agg/include/agg_renderer_scanline.h → src/agg/include/agg/agg_renderer_scanline.h b/src/agg/include/agg_renderer_scanline.h → src/agg/include/agg/agg_renderer_scanline.h
diff --git a/src/agg/include/agg_rendering_buffer.h → src/agg/include/agg/agg_rendering_buffer.h b/src/agg/include/agg_rendering_buffer.h → src/agg/include/agg/agg_rendering_buffer.h
diff --git a/...gg/include/agg_rendering_buffer_dynarow.h → ...nclude/agg/agg_rendering_buffer_dynarow.h b/...gg/include/agg_rendering_buffer_dynarow.h → ...nclude/agg/agg_rendering_buffer_dynarow.h
diff --git a/src/agg/include/agg_rounded_rect.h → src/agg/include/agg/agg_rounded_rect.h b/src/agg/include/agg_rounded_rect.h → src/agg/include/agg/agg_rounded_rect.h
diff --git a/src/agg/include/agg_scanline_bin.h → src/agg/include/agg/agg_scanline_bin.h b/src/agg/include/agg_scanline_bin.h → src/agg/include/agg/agg_scanline_bin.h
diff --git a/...gg/include/agg_scanline_boolean_algebra.h → ...nclude/agg/agg_scanline_boolean_algebra.h b/...gg/include/agg_scanline_boolean_algebra.h → ...nclude/agg/agg_scanline_boolean_algebra.h
diff --git a/src/agg/include/agg_scanline_p.h → src/agg/include/agg/agg_scanline_p.h b/src/agg/include/agg_scanline_p.h → src/agg/include/agg/agg_scanline_p.h
diff --git a/src/agg/include/agg_scanline_storage_aa.h → ...agg/include/agg/agg_scanline_storage_aa.h b/src/agg/include/agg_scanline_storage_aa.h → ...agg/include/agg/agg_scanline_storage_aa.h
diff --git a/src/agg/include/agg_scanline_storage_bin.h → ...gg/include/agg/agg_scanline_storage_bin.h b/src/agg/include/agg_scanline_storage_bin.h → ...gg/include/agg/agg_scanline_storage_bin.h
diff --git a/src/agg/include/agg_scanline_u.h → src/agg/include/agg/agg_scanline_u.h b/src/agg/include/agg_scanline_u.h → src/agg/include/agg/agg_scanline_u.h
diff --git a/src/agg/include/agg_shorten_path.h → src/agg/include/agg/agg_shorten_path.h b/src/agg/include/agg_shorten_path.h → src/agg/include/agg/agg_shorten_path.h
diff --git a/src/agg/include/agg_simul_eq.h → src/agg/include/agg/agg_simul_eq.h b/src/agg/include/agg_simul_eq.h → src/agg/include/agg/agg_simul_eq.h
diff --git a/src/agg/include/agg_span_allocator.h → src/agg/include/agg/agg_span_allocator.h b/src/agg/include/agg_span_allocator.h → src/agg/include/agg/agg_span_allocator.h
diff --git a/src/agg/include/agg_span_converter.h → src/agg/include/agg/agg_span_converter.h b/src/agg/include/agg_span_converter.h → src/agg/include/agg/agg_span_converter.h
diff --git a/src/agg/include/agg_span_gouraud.h → src/agg/include/agg/agg_span_gouraud.h b/src/agg/include/agg_span_gouraud.h → src/agg/include/agg/agg_span_gouraud.h
diff --git a/src/agg/include/agg_span_gouraud_gray.h → src/agg/include/agg/agg_span_gouraud_gray.h b/src/agg/include/agg_span_gouraud_gray.h → src/agg/include/agg/agg_span_gouraud_gray.h
diff --git a/src/agg/include/agg_span_gouraud_rgba.h → src/agg/include/agg/agg_span_gouraud_rgba.h b/src/agg/include/agg_span_gouraud_rgba.h → src/agg/include/agg/agg_span_gouraud_rgba.h
diff --git a/src/agg/include/agg_span_gradient.h → src/agg/include/agg/agg_span_gradient.h b/src/agg/include/agg_span_gradient.h → src/agg/include/agg/agg_span_gradient.h
diff --git a/src/agg/include/agg_span_gradient_alpha.h → ...agg/include/agg/agg_span_gradient_alpha.h b/src/agg/include/agg_span_gradient_alpha.h → ...agg/include/agg/agg_span_gradient_alpha.h
diff --git a/src/agg/include/agg_span_gradient_contour.h → ...g/include/agg/agg_span_gradient_contour.h b/src/agg/include/agg_span_gradient_contour.h → ...g/include/agg/agg_span_gradient_contour.h
diff --git a/src/agg/include/agg_span_gradient_image.h → ...agg/include/agg/agg_span_gradient_image.h b/src/agg/include/agg_span_gradient_image.h → ...agg/include/agg/agg_span_gradient_image.h
diff --git a/src/agg/include/agg_span_image_filter.h → src/agg/include/agg/agg_span_image_filter.h b/src/agg/include/agg_span_image_filter.h → src/agg/include/agg/agg_span_image_filter.h
diff --git a/src/agg/include/agg_span_image_filter_gray.h → .../include/agg/agg_span_image_filter_gray.h b/src/agg/include/agg_span_image_filter_gray.h → .../include/agg/agg_span_image_filter_gray.h
diff --git a/src/agg/include/agg_span_image_filter_rgb.h → ...g/include/agg/agg_span_image_filter_rgb.h b/src/agg/include/agg_span_image_filter_rgb.h → ...g/include/agg/agg_span_image_filter_rgb.h
diff --git a/src/agg/include/agg_span_image_filter_rgba.h → .../include/agg/agg_span_image_filter_rgba.h b/src/agg/include/agg_span_image_filter_rgba.h → .../include/agg/agg_span_image_filter_rgba.h
diff --git a/...g/include/agg_span_interpolator_adaptor.h → ...clude/agg/agg_span_interpolator_adaptor.h b/...g/include/agg_span_interpolator_adaptor.h → ...clude/agg/agg_span_interpolator_adaptor.h
diff --git a/...gg/include/agg_span_interpolator_linear.h → ...nclude/agg/agg_span_interpolator_linear.h b/...gg/include/agg_span_interpolator_linear.h → ...nclude/agg/agg_span_interpolator_linear.h
diff --git a/...agg/include/agg_span_interpolator_persp.h → ...include/agg/agg_span_interpolator_persp.h b/...agg/include/agg_span_interpolator_persp.h → ...include/agg/agg_span_interpolator_persp.h
diff --git a/...agg/include/agg_span_interpolator_trans.h → ...include/agg/agg_span_interpolator_trans.h b/...agg/include/agg_span_interpolator_trans.h → ...include/agg/agg_span_interpolator_trans.h
diff --git a/src/agg/include/agg_span_pattern_gray.h → src/agg/include/agg/agg_span_pattern_gray.h b/src/agg/include/agg_span_pattern_gray.h → src/agg/include/agg/agg_span_pattern_gray.h
diff --git a/src/agg/include/agg_span_pattern_rgb.h → src/agg/include/agg/agg_span_pattern_rgb.h b/src/agg/include/agg_span_pattern_rgb.h → src/agg/include/agg/agg_span_pattern_rgb.h
diff --git a/src/agg/include/agg_span_pattern_rgba.h → src/agg/include/agg/agg_span_pattern_rgba.h b/src/agg/include/agg_span_pattern_rgba.h → src/agg/include/agg/agg_span_pattern_rgba.h
diff --git a/src/agg/include/agg_span_solid.h → src/agg/include/agg/agg_span_solid.h b/src/agg/include/agg_span_solid.h → src/agg/include/agg/agg_span_solid.h
diff --git a/src/agg/include/agg_span_subdiv_adaptor.h → ...agg/include/agg/agg_span_subdiv_adaptor.h b/src/agg/include/agg_span_subdiv_adaptor.h → ...agg/include/agg/agg_span_subdiv_adaptor.h
diff --git a/src/agg/include/agg_trans_affine.h → src/agg/include/agg/agg_trans_affine.h b/src/agg/include/agg_trans_affine.h → src/agg/include/agg/agg_trans_affine.h
diff --git a/src/agg/include/agg_trans_bilinear.h → src/agg/include/agg/agg_trans_bilinear.h b/src/agg/include/agg_trans_bilinear.h → src/agg/include/agg/agg_trans_bilinear.h
diff --git a/src/agg/include/agg_trans_double_path.h → src/agg/include/agg/agg_trans_double_path.h b/src/agg/include/agg_trans_double_path.h → src/agg/include/agg/agg_trans_double_path.h
diff --git a/src/agg/include/agg_trans_perspective.h → src/agg/include/agg/agg_trans_perspective.h b/src/agg/include/agg_trans_perspective.h → src/agg/include/agg/agg_trans_perspective.h
diff --git a/src/agg/include/agg_trans_single_path.h → src/agg/include/agg/agg_trans_single_path.h b/src/agg/include/agg_trans_single_path.h → src/agg/include/agg/agg_trans_single_path.h
diff --git a/src/agg/include/agg_trans_viewport.h → src/agg/include/agg/agg_trans_viewport.h b/src/agg/include/agg_trans_viewport.h → src/agg/include/agg/agg_trans_viewport.h
diff --git a/src/agg/include/agg_trans_warp_magnifier.h → ...gg/include/agg/agg_trans_warp_magnifier.h b/src/agg/include/agg_trans_warp_magnifier.h → ...gg/include/agg/agg_trans_warp_magnifier.h
diff --git a/src/agg/include/agg_vcgen_bspline.h → src/agg/include/agg/agg_vcgen_bspline.h b/src/agg/include/agg_vcgen_bspline.h → src/agg/include/agg/agg_vcgen_bspline.h
diff --git a/src/agg/include/agg_vcgen_contour.h → src/agg/include/agg/agg_vcgen_contour.h b/src/agg/include/agg_vcgen_contour.h → src/agg/include/agg/agg_vcgen_contour.h
diff --git a/src/agg/include/agg_vcgen_dash.h → src/agg/include/agg/agg_vcgen_dash.h b/src/agg/include/agg_vcgen_dash.h → src/agg/include/agg/agg_vcgen_dash.h
diff --git a/src/agg/include/agg_vcgen_markers_term.h → src/agg/include/agg/agg_vcgen_markers_term.h b/src/agg/include/agg_vcgen_markers_term.h → src/agg/include/agg/agg_vcgen_markers_term.h
diff --git a/src/agg/include/agg_vcgen_smooth_poly1.h → src/agg/include/agg/agg_vcgen_smooth_poly1.h b/src/agg/include/agg_vcgen_smooth_poly1.h → src/agg/include/agg/agg_vcgen_smooth_poly1.h
diff --git a/src/agg/include/agg_vcgen_stroke.h → src/agg/include/agg/agg_vcgen_stroke.h b/src/agg/include/agg_vcgen_stroke.h → src/agg/include/agg/agg_vcgen_stroke.h
diff --git a/src/agg/include/agg_vcgen_vertex_sequence.h → ...g/include/agg/agg_vcgen_vertex_sequence.h b/src/agg/include/agg_vcgen_vertex_sequence.h → ...g/include/agg/agg_vcgen_vertex_sequence.h
diff --git a/src/agg/include/agg_vertex_sequence.h → src/agg/include/agg/agg_vertex_sequence.h b/src/agg/include/agg_vertex_sequence.h → src/agg/include/agg/agg_vertex_sequence.h
diff --git a/src/agg/include/agg_vpgen_clip_polygon.h → src/agg/include/agg/agg_vpgen_clip_polygon.h b/src/agg/include/agg_vpgen_clip_polygon.h → src/agg/include/agg/agg_vpgen_clip_polygon.h
diff --git a/src/agg/include/agg_vpgen_clip_polyline.h → ...agg/include/agg/agg_vpgen_clip_polyline.h b/src/agg/include/agg_vpgen_clip_polyline.h → ...agg/include/agg/agg_vpgen_clip_polyline.h
diff --git a/src/agg/include/agg_vpgen_segmentator.h → src/agg/include/agg/agg_vpgen_segmentator.h b/src/agg/include/agg_vpgen_segmentator.h → src/agg/include/agg/agg_vpgen_segmentator.h
diff --git a/src/agg/include/ctrl/Makefile.am → src/agg/include/agg/ctrl/Makefile.am b/src/agg/include/ctrl/Makefile.am → src/agg/include/agg/ctrl/Makefile.am
diff --git a/src/agg/include/ctrl/agg_bezier_ctrl.h → src/agg/include/agg/ctrl/agg_bezier_ctrl.h b/src/agg/include/ctrl/agg_bezier_ctrl.h → src/agg/include/agg/ctrl/agg_bezier_ctrl.h
diff --git a/src/agg/include/ctrl/agg_cbox_ctrl.h → src/agg/include/agg/ctrl/agg_cbox_ctrl.h b/src/agg/include/ctrl/agg_cbox_ctrl.h → src/agg/include/agg/ctrl/agg_cbox_ctrl.h
diff --git a/src/agg/include/ctrl/agg_ctrl.h → src/agg/include/agg/ctrl/agg_ctrl.h b/src/agg/include/ctrl/agg_ctrl.h → src/agg/include/agg/ctrl/agg_ctrl.h
diff --git a/src/agg/include/ctrl/agg_gamma_ctrl.h → src/agg/include/agg/ctrl/agg_gamma_ctrl.h b/src/agg/include/ctrl/agg_gamma_ctrl.h → src/agg/include/agg/ctrl/agg_gamma_ctrl.h
diff --git a/src/agg/include/ctrl/agg_gamma_spline.h → src/agg/include/agg/ctrl/agg_gamma_spline.h b/src/agg/include/ctrl/agg_gamma_spline.h → src/agg/include/agg/ctrl/agg_gamma_spline.h
diff --git a/src/agg/include/ctrl/agg_polygon_ctrl.h → src/agg/include/agg/ctrl/agg_polygon_ctrl.h b/src/agg/include/ctrl/agg_polygon_ctrl.h → src/agg/include/agg/ctrl/agg_polygon_ctrl.h
diff --git a/src/agg/include/ctrl/agg_rbox_ctrl.h → src/agg/include/agg/ctrl/agg_rbox_ctrl.h b/src/agg/include/ctrl/agg_rbox_ctrl.h → src/agg/include/agg/ctrl/agg_rbox_ctrl.h
diff --git a/src/agg/include/ctrl/agg_scale_ctrl.h → src/agg/include/agg/ctrl/agg_scale_ctrl.h b/src/agg/include/ctrl/agg_scale_ctrl.h → src/agg/include/agg/ctrl/agg_scale_ctrl.h
diff --git a/src/agg/include/ctrl/agg_slider_ctrl.h → src/agg/include/agg/ctrl/agg_slider_ctrl.h b/src/agg/include/ctrl/agg_slider_ctrl.h → src/agg/include/agg/ctrl/agg_slider_ctrl.h
diff --git a/src/agg/include/ctrl/agg_spline_ctrl.h → src/agg/include/agg/ctrl/agg_spline_ctrl.h b/src/agg/include/ctrl/agg_spline_ctrl.h → src/agg/include/agg/ctrl/agg_spline_ctrl.h
diff --git a/src/agg/include/platform/Makefile.am → src/agg/include/agg/platform/Makefile.am b/src/agg/include/platform/Makefile.am → src/agg/include/agg/platform/Makefile.am
diff --git a/...g/include/platform/agg_platform_support.h → ...clude/agg/platform/agg_platform_support.h b/...g/include/platform/agg_platform_support.h → ...clude/agg/platform/agg_platform_support.h
diff --git a/src/agg/include/platform/mac/agg_mac_pmap.h → ...g/include/agg/platform/mac/agg_mac_pmap.h b/src/agg/include/platform/mac/agg_mac_pmap.h → ...g/include/agg/platform/mac/agg_mac_pmap.h
diff --git a/...gg/include/platform/win32/agg_win32_bmp.h → ...nclude/agg/platform/win32/agg_win32_bmp.h b/...gg/include/platform/win32/agg_win32_bmp.h → ...nclude/agg/platform/win32/agg_win32_bmp.h
diff --git a/src/agg/include/util/Makefile.am → src/agg/include/agg/util/Makefile.am b/src/agg/include/util/Makefile.am → src/agg/include/agg/util/Makefile.am
diff --git a/src/agg/include/util/agg_color_conv.h → src/agg/include/agg/util/agg_color_conv.h b/src/agg/include/util/agg_color_conv.h → src/agg/include/agg/util/agg_color_conv.h
diff --git a/src/agg/include/util/agg_color_conv_rgb16.h → ...g/include/agg/util/agg_color_conv_rgb16.h b/src/agg/include/util/agg_color_conv_rgb16.h → ...g/include/agg/util/agg_color_conv_rgb16.h
diff --git a/src/agg/include/util/agg_color_conv_rgb8.h → ...gg/include/agg/util/agg_color_conv_rgb8.h b/src/agg/include/util/agg_color_conv_rgb8.h → ...gg/include/agg/util/agg_color_conv_rgb8.h
diff --git a/src/makefile b/src/makefile
@@ -6,7 +6,7 @@ this_name := $(shell cat $(d)../name.txt)
 
 this_soname := $(shell cat $(d)../soname.txt)
 
-this_headers_dir := agg/include
+this_headers_dir := agg/include/agg
 
 this_install_cxx_hdrs := $(patsubst $(d)%,%,$(wildcard $(d)$(this_headers_dir)/*.h))
 
@@ -17,7 +17,7 @@ this_headers_install_dir := agg # TODO: make it $(this_name) when library is ren
 
 this_srcs += $(patsubst $(d)%,%,$(wildcard $(d)agg/src/*.cpp))
 
-this_cxxflags += -I $(d)agg/include
+this_cxxflags += -I $(d)agg/include/agg
 this_cxxflags += -fstrict-aliasing # in order to comply with the c++ standard more strictly
 this_cxxflags += -fPIC
 

diff --git a/tests/conv_stroke_close_points/main.cpp b/tests/conv_stroke_close_points/main.cpp
@@ -2,8 +2,8 @@
 #include <iomanip>
 #include <cassert>
 
-#include "../../src/agg/include/agg_path_storage.h"
-#include "../../src/agg/include/agg_conv_stroke.h"
+#include "../../src/agg/include/agg/agg_path_storage.h"
+#include "../../src/agg/include/agg/agg_conv_stroke.h"
 
 int main(int argc, const char** argv){
 

diff --git a/tests/dashed_closed_path/main.cpp b/tests/dashed_closed_path/main.cpp
@@ -2,8 +2,8 @@
 #include <iomanip>
 #include <cassert>
 
-#include "../../src/agg/include/agg_path_storage.h"
-#include "../../src/agg/include/agg_conv_dash.h"
+#include "../../src/agg/include/agg/agg_path_storage.h"
+#include "../../src/agg/include/agg/agg_conv_dash.h"
 
 int main(int argc, const char** argv){