Makefile improvement

[Dave Love]

I wanted to override make variables for the libraries from the command
line and failed because the autoconf values were substituted
directly.  This patch allowed me to do what I wanted.

2003-03-18  Dave Love  <address@hidden>

        * src/Makefile.am: Use make variable substitutions in various
        places, not autoconf ones, so things can be overridden more
        usefully.

===================================================================
RCS file: src/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 src/Makefile.am
--- src/Makefile.am     2003/02/21 15:20:38     1.1
+++ src/Makefile.am     2003/03/18 16:40:50
@@ -1,9 +1,9 @@
-CFLAGS = @GCC_CFLAG@ @CFLAGS@  
+CFLAGS = $(GCC_CFLAG) @CFLAGS@  
 YFLAGS = -d
 LEXLIB = @LEXLIB@
-LDADD = -L../pub -lpub @BERKELEY_DB_LDFLAGS@ @BERKELEY_DB_LIB@ 
@OPENSSL_LIB_LDFLAGS@ @OPENSSL_LIB_LIB@
-INCLUDES = @BERKELEY_DB_CFLAGS@ @OPENSSL_LIB_CPPFLAGS@
-LDFLAGS = @BERKELEY_DB_LDFLAGS@ @OPENSSL_LIB_LDFLAGS@ @LDFLAGS@
+LDADD = -L../pub -lpub $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) 
$(OPENSSL_LIB_LDFLAGS) $(OPENSSL_LIB_LIB)
+INCLUDES = $(BERKELEY_DB_CFLAGS) $(OPENSSL_LIB_CPPFLAGS)
+LDFLAGS = $(BERKELEY_DB_LDFLAGS) $(OPENSSL_LIB_LDFLAGS) @LDFLAGS@
 
 sbin_PROGRAMS = cfagent cfservd cfrun cfkey cfenvd cfenvgraph cfexecd
 
@@ -66,7 +66,7 @@
        nameinfo.c                                                      \
        strategies.c
 
-cfagent_LDADD = $(LEXLIB) @BERKELEY_DB_LIB@ @OPENSSL_LIB_LIB@
+cfagent_LDADD = $(LEXLIB) $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LIB)
 
 cfservd_SOURCES =                                                      \
        cfservd.c                                                       \
@@ -109,7 +109,7 @@
        nameinfo.c                                                      \
        strategies.c
 
-cfservd_LDADD = $(LEXLIB)  @BERKELEY_DB_LIB@ @OPENSSL_LIB_LIB@
+cfservd_LDADD = $(LEXLIB)  $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LIB)
 
 cfexecd_SOURCES =                                                      \
        cfexecd.c                                                       \
@@ -130,7 +130,7 @@
        item.c                                                          \
        init.c
 
-cfexecd_LDADD = $(LEXLIB)  @BERKELEY_DB_LIB@ @OPENSSL_LIB_LIB@
+cfexecd_LDADD = $(LEXLIB)  $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LIB)
 
 cfrun_SOURCES =                                                                
\
        cfrun.c                                                         \
@@ -186,6 +186,9 @@
        patches.c                                                       \
        locks.c                                                         \
        init.c
+
+EXTRA_cfenvd_SOURCES = getloadavg.c
+cfenvd_LDADD = $(LIBS) $(LDADD)
 
 cfenvgraph_SOURCES =                                                   \
        cfenvgraph.c                                                    \