Build system: ENABLE_... conditionals in Makefile.am only for file inclusion

In makefile.am use "if ENABLE_..." conditionals only to decide which
files get included in general "make" and "make install" processes, not
for compilation rules. This way single filters can be built by "make
NAME" regardless whether appropriate "--enable-..." arguments got
supplied to "./configure".

Now we can do "make pstops" and make "make rastertopwg" without
appropriate arguments for "./configure".

diff --git a/Makefile.am b/Makefile.am
index 8988cf4c3544d1c8bbc4bfa8c035b4a6d6580ad2..76de5583382ae05b5aa6e326cf2a51c78c4dc093 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1068,7 +1068,6 @@ rastertops_LDADD = \
        $(CUPS_LIBS) \
        libcupsfilters.la
 
-if ENABLE_RASTERTOPWG
 rastertopwg_SOURCES = \
        filter/rastertopwg.c
 rastertopwg_CFLAGS = \
@@ -1077,7 +1076,6 @@ rastertopwg_CFLAGS = \
 rastertopwg_LDADD = \
        $(CUPS_LIBS) \
        libcupsfilters.la
-endif
 
 texttotext_SOURCES = \
        filter/texttotext.c
@@ -1106,7 +1104,6 @@ pdftops_LDADD = \
        libcupsfilters.la \
        $(CUPS_LIBS)
 
-if ENABLE_PSTOPS
 pstops_SOURCES = \
        filter/pstops.c
 pstops_CFLAGS = \
@@ -1115,7 +1112,6 @@ pstops_CFLAGS = \
 pstops_LDADD = \
        libcupsfilters.la \
        $(CUPS_LIBS)
-endif
 
 pdftoraster_SOURCES = \
        filter/pdftoraster.c