| df378ddc | 2019-05-13 05:51:06 | Michele Calgaro |
Removed unused files and changed file names to conform to .cmake convention for configuration files. Signed-off-by: Michele Calgaro <michele.calgaro@...> |
||
|
A art_config.h.cmake A libart-2.0.pc.cmake A libart-features.h.cmake M CMakeLists.txt R Makefile.am R art_config.h.in R config.h.in R configure.in R gen_art_config.sh.in R libart-2.0-uninstalled.pc.in R libart-2.0.pc.in R libart-features.h.in R libart-zip.in |
||
CMakeLists.txtdiff --git a/CMakeLists.txt b/CMakeLists.txt index 2772339..e6571c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,8 +73,8 @@ ##### write configure files configure_file( config.h.cmake config.h @ONLY ) -configure_file( art_config.h.in art_config.h @ONLY ) -configure_file( libart-features.h.in libart-features.h @ONLY ) +configure_file( art_config.h.cmake art_config.h @ONLY ) +configure_file( libart-features.h.cmake libart-features.h @ONLY ) include_directories( @@ -222,7 +222,7 @@ string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" includedir ${INCLUDE_INSTALL_DIR} )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir ${LIB_INSTALL_DIR} )
-configure_file( libart-2.0.pc.in libart-2.0.pc @ONLY ) +configure_file( libart-2.0.pc.cmake libart-2.0.pc @ONLY ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libart-2.0.pc
Makefile.amdiff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 90bdd3b..0000000 --- a/Makefile.am +++ /dev/null @@ -1,168 +0,0 @@ -noinst_PROGRAMS = testart testuta - -bin_SCRIPTS = \ - libart2-config - -BUILT_SOURCES = art_config.h libart-features.h - -EXTRA_DIST = \ - libart.def \ - libart-2.0.pc.in \ - libart-2.0-uninstalled.pc.in - -lib_LTLIBRARIES = libart_lgpl_2.la - -if PLATFORM_WIN32 -no_undefined = -no-undefined -endif - -if OS_WIN32 -export_symbols = -export-symbols libart.def - -install-libtool-import-lib: - $(INSTALL) .libs/libart_lgpl_2.dll.a $(DESTDIR)$(libdir) -uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libart_lgpl_2.dll.a -else -install-libtool-import-lib: -uninstall-libtool-import-lib: - -libm = -lm -endif - -if MS_LIB_AVAILABLE -noinst_DATA = art_lgpl_2.lib - -install-ms-lib: - $(INSTALL) art_lgpl_2.lib $(DESTDIR)$(libdir) - -uninstall-ms-lib: - -rm $(DESTDIR)$(libdir)/art_lgpl_2.lib - -art_lgpl_2.lib : libart_lgpl_2.la - lib -name:libart_lgpl_2-@LIBART_MAJOR_VERSION@.dll -def:libart.def -out:$@ - -else -install-ms-lib: -uninstall-ms-lib: -endif - -libart_lgpl_2_la_SOURCES = \ - art_affine.c \ - art_alphagamma.c \ - art_bpath.c \ - art_gray_svp.c \ - art_misc.c \ - art_pixbuf.c \ - art_rect.c \ - art_rect_svp.c \ - art_rect_uta.c \ - art_render.c \ - art_render_gradient.c \ - art_render_mask.c \ - art_render_svp.c \ - art_rgb.c \ - art_rgb_affine.c \ - art_rgb_affine_private.c \ - art_rgb_affine_private.h \ - art_rgb_bitmap_affine.c \ - art_rgb_pixbuf_affine.c \ - art_rgb_rgba_affine.c \ - art_rgb_a_affine.c \ - art_rgba.c \ - art_rgb_svp.c \ - art_svp.c \ - art_svp_intersect.c \ - art_svp_ops.c \ - art_svp_point.c \ - art_svp_render_aa.c \ - art_svp_vpath.c \ - art_svp_vpath_stroke.c \ - art_svp_wind.c \ - art_uta.c \ - art_uta_ops.c \ - art_uta_rect.c \ - art_uta_vpath.c \ - art_uta_svp.c \ - art_vpath.c \ - art_vpath_bpath.c \ - art_vpath_dash.c \ - art_vpath_svp.c \ - libart-features.c - -libart_lgpl_2_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ $(no_undefined) $(export_symbols) -libart_lgpl_2_la_LIBADD = $(libm) - -libart_lgplincdir = $(includedir)/libart-2.0/libart_lgpl -libart_lgplinc_HEADERS = \ - art_affine.h \ - art_alphagamma.h \ - art_bpath.h \ - art_config.h \ - art_filterlevel.h \ - art_gray_svp.h \ - art_misc.h \ - art_pathcode.h \ - art_pixbuf.h \ - art_point.h \ - art_rect.h \ - art_rect_svp.h \ - art_rect_uta.h \ - art_render.h \ - art_render_gradient.h \ - art_render_mask.h \ - art_render_svp.h \ - art_rgb.h \ - art_rgb_affine.h \ - art_rgb_bitmap_affine.h \ - art_rgb_pixbuf_affine.h \ - art_rgb_rgba_affine.h \ - art_rgb_a_affine.h \ - art_rgb_svp.h \ - art_rgba.h \ - art_svp.h \ - art_svp_intersect.h \ - art_svp_ops.h \ - art_svp_point.h \ - art_svp_render_aa.h \ - art_svp_vpath.h \ - art_svp_vpath_stroke.h \ - art_svp_wind.h \ - art_uta.h \ - art_uta_ops.h \ - art_uta_rect.h \ - art_uta_vpath.h \ - art_uta_svp.h \ - art_vpath.h \ - art_vpath_bpath.h \ - art_vpath_dash.h \ - art_vpath_svp.h \ - libart.h \ - libart-features.h - -INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DLIBART_COMPILATION - -DEPS = $(top_builddir)/libart_lgpl_2.la -LDADDS = $(top_builddir)/libart_lgpl_2.la - -testart_SOURCES=testart.c -testart_LDFLAGS = -testart_DEPENDENCIES = $(DEPS) -testart_LDADD = $(LDADDS) $(libm) - -testuta_SOURCES=testuta.c -testuta_LDFLAGS = -testuta_DEPENDENCIES = $(DEPS) -testuta_LDADD = $(LDADDS) $(libm) - -tests: testart testuta - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libart-2.0.pc - -install-data-local: install-ms-lib install-libtool-import-lib - -uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib - -CLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) -DISTCLEANFILES = $(BUILT_SOURCES) $(bin_SCRIPTS) art_config.h.cmakediff --git a/art_config.h.cmake b/art_config.h.cmake new file mode 100644 index 0000000..cfa4786 --- /dev/null +++ b/art_config.h.cmake @@ -0,0 +1,25 @@ + +#ifndef _ART_CONFIG_H_ +#define _ART_CONFIG_H_ + +#define ART_SIZEOF_CHAR @ART_SIZEOF_CHAR@ +#define ART_SIZEOF_SHORT @ART_SIZEOF_SHORT@ +#define ART_SIZEOF_INT @ART_SIZEOF_INT@ +#define ART_SIZEOF_LONG @ART_SIZEOF_LONG@ + +typedef @ART_U8_TYPE@ art_u8; +typedef @ART_U16_TYPE@ art_u16; +typedef @ART_U32_TYPE@ art_u32; + +#if defined(__KDE_HAVE_GCC_VISIBILITY) || defined(G_HAVE_GCC_VISIBILITY) +#define LIBART_NO_EXPORT __attribute__ ((visibility("hidden")))
+#define LIBART_EXPORT __attribute__ ((visibility("default")))
+#elif defined(_WIN32) +#define LIBART_NO_EXPORT +#define LIBART_EXPORT __declspec(dllexport) +#else +#define LIBART_NO_EXPORT +#define LIBART_EXPORT +#endif + +#endif /* _ART_CONFIG_H_ */ art_config.h.indiff --git a/art_config.h.in b/art_config.h.in deleted file mode 100644 index cfa4786..0000000 --- a/art_config.h.in +++ /dev/null @@ -1,25 +0,0 @@ - -#ifndef _ART_CONFIG_H_ -#define _ART_CONFIG_H_ - -#define ART_SIZEOF_CHAR @ART_SIZEOF_CHAR@ -#define ART_SIZEOF_SHORT @ART_SIZEOF_SHORT@ -#define ART_SIZEOF_INT @ART_SIZEOF_INT@ -#define ART_SIZEOF_LONG @ART_SIZEOF_LONG@ - -typedef @ART_U8_TYPE@ art_u8; -typedef @ART_U16_TYPE@ art_u16; -typedef @ART_U32_TYPE@ art_u32; - -#if defined(__KDE_HAVE_GCC_VISIBILITY) || defined(G_HAVE_GCC_VISIBILITY) -#define LIBART_NO_EXPORT __attribute__ ((visibility("hidden")))
** Diff limit reached (max: 250 lines) **
|
||