diff options
author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
---|---|---|
committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/3rdparty/libmng/makefiles/Makefile.am | |
parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/3rdparty/libmng/makefiles/Makefile.am')
-rw-r--r-- | src/3rdparty/libmng/makefiles/Makefile.am | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/3rdparty/libmng/makefiles/Makefile.am b/src/3rdparty/libmng/makefiles/Makefile.am deleted file mode 100644 index b53523e9aa..0000000000 --- a/src/3rdparty/libmng/makefiles/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = 1.3 foreign no-dependencies - -# include the app subdirectories in the distribution -EXTRA_DIST = makefiles doc contrib - - -# libmng release @VERSION@ -libmng_la_LDFLAGS = -version-info 1:0:0 - -lib_LTLIBRARIES = libmng.la - -include_HEADERS = libmng.h libmng_conf.h libmng_types.h -noinst_HEADERS = libmng_chunk_io.h libmng_chunk_prc.h libmng_chunks.h \ - libmng_cms.h libmng_data.h libmng_display.h libmng_dither.h \ - libmng_error.h libmng_filter.h libmng_jpeg.h libmng_memory.h \ - libmng_object_prc.h libmng_objects.h libmng_pixels.h \ - libmng_read.h libmng_trace.h libmng_write.h libmng_zlib.h - -libmng_la_SOURCES = libmng_callback_xs.c libmng_chunk_io.c \ - libmng_chunk_prc.c libmng_chunk_xs.c libmng_cms.c \ - libmng_display.c libmng_dither.c libmng_error.c \ - libmng_filter.c libmng_hlapi.c libmng_jpeg.c \ - libmng_object_prc.c libmng_pixels.c libmng_prop_xs.c \ - libmng_read.c libmng_trace.c libmng_write.c libmng_zlib.c - -man_MANS = doc/man/libmng.3 doc/man/jng.5 doc/man/mng.5 - |