fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 04:08:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename Makefile.*.config to Makefile.*.features as they should not be modified

Browse source 
The .config naming was giving people the impression that they can modify it.
That's not the case.
This commit is contained in:
Behdad Esfahbod 2008-09-22 17:34:36 -04:00
parent 20be3182ef
commit 23b9767bb3
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
autogen.sh
View file

@ -169,9 +169,9 @@ do_cmd $ACLOCAL $ACLOCAL_FLAGS
do_cmd $AUTOHEADER
# create dummy */Makefile.am.config and ChangeLog to make automake happy
> boilerplate/Makefile.am.config
> src/Makefile.am.config
# create dummy */Makefile.am.features and ChangeLog to make automake happy
> boilerplate/Makefile.am.features
> src/Makefile.am.features
touch ChangeLog
# We don't call gtkdocize right now. When we do, we should then modify

2
boilerplate/Makefile.am
View file

@ -1,7 +1,7 @@
# Note: All source files are listed in Makefile.sources.
include $(top_srcdir)/build/Makefile.am.common
include $(srcdir)/Makefile.am.config
include $(srcdir)/Makefile.am.features
AM_CPPFLAGS = \
-I$(srcdir) \

10
build/aclocal.makefile.m4
View file

@ -1,6 +1,6 @@
dnl
dnl These are the facilities for generating Makefile.am.config and
dnl Makefile.win32.config files.
dnl These are the facilities for generating Makefile.am.features and
dnl Makefile.win32.features files.
dnl
dnl
@ -72,7 +72,7 @@ m4_define([_CAIRO_MAKEFILES])dnl
dnl
dnl CAIRO_CONFIG_MAKEFILE(TAG, DIR)
dnl
dnl Create DIR/Makefile.*.config files
dnl Create DIR/Makefile.*.features files
dnl TAG is a TAG used by other CAIRO_MAKEFILE_* macros to append to these
dnl Makefile's.
dnl
@ -89,10 +89,10 @@ AC_DEFUN([CAIRO_CONFIG_MAKEFILE],
CAIRO_ACCUMULATORS_REGISTER(MAKEFILE_$1_WIN32, m4_newline, [# Generated by configure. Do not edit.]m4_newline[include Makefile.sources]m4_newline)dnl
dnl Generate
CAIRO_CONFIG_COMMANDS([$srcdir/$2/Makefile.am.config],
CAIRO_CONFIG_COMMANDS([$srcdir/$2/Makefile.am.features],
[echo "$CAIRO_MAKEFILE_$1_AMAKE"],
[CAIRO_MAKEFILE_$1_AMAKE='$CAIRO_MAKEFILE_$1_AMAKE'])dnl
CAIRO_CONFIG_COMMANDS([$srcdir/$2/Makefile.win32.config],
CAIRO_CONFIG_COMMANDS([$srcdir/$2/Makefile.win32.features],
[echo "$CAIRO_MAKEFILE_$1_WIN32"],
[CAIRO_MAKEFILE_$1_WIN32='$CAIRO_MAKEFILE_$1_WIN32'])dnl
])dnl

2
doc/public/Makefile.am
View file

@ -1,5 +1,5 @@
include $(top_srcdir)/build/Makefile.am.common
include $(top_srcdir)/src/Makefile.am.config
include $(top_srcdir)/src/Makefile.am.features
# The name of the module.
DOC_MODULE=cairo

2
src/Makefile.am
View file

@ -1,7 +1,7 @@
# Note: All source files are listed in Makefile.sources.
include $(top_srcdir)/build/Makefile.am.common
include $(srcdir)/Makefile.am.config
include $(srcdir)/Makefile.am.features
AM_CPPFLAGS = -I$(srcdir) $(CAIRO_CFLAGS)