diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-04-08 09:12:06 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-04-08 09:12:06 +0200 |
| commit | ac6222f9459a1f6144f5a1da228d0b5b6c99788b (patch) | |
| tree | 8c97e68813989427061364409572ef99547393d4 /cmake | |
| parent | c2711be4c98222df1f9b03efcddc6d81ace09609 (diff) | |
| download | libgd-ac6222f9459a1f6144f5a1da228d0b5b6c99788b.tar.gz | |
Merge outstanding autotools changes
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Makefile.am | 2 | ||||
| -rw-r--r-- | cmake/modules/Makefile.am | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/cmake/Makefile.am b/cmake/Makefile.am index c1cfa8d..69f6d8c 100644 --- a/cmake/Makefile.am +++ b/cmake/Makefile.am @@ -1,4 +1,4 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -AUTOMAKE_OPTIONS = foreign 1.7 + SUBDIRS = modules diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am index d8af108..d1fbf64 100644 --- a/cmake/modules/Makefile.am +++ b/cmake/modules/Makefile.am @@ -1,4 +1,3 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -AUTOMAKE_OPTIONS = foreign 1.7 EXTRA_DIST = AC_HEADER_STDC.cmake FindGD.cmake FindXPM.cmake TestForHighBitCharacters.c CheckDIRSymbolExists.cmake FindFontconfig.cmake FindPNG.cmake gd.cmake TestForHighBitCharacters.cmake CheckPrototypeExists.cmake FindFreetype.cmake FindPTHREAD.cmake TestForStandardHeaderwait.cmake |