Changes for new Automake version.

diff --git a/src/Makefile.am b/src/Makefile.am
index 70b1d718181d7dd7ba58126c0c0dae74be47679c..afcd8fa8a9ea41d5d5aab1ebd868bd0e9f04832c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with `automake' to generate `Makefile.in'
 ## -*-makefile-*-
 ##
 ## Process this file with `automake' to generate `Makefile.in'
 ## -*-makefile-*-
 ##

-## $Id: Makefile.am,v 1.11 1998/06/18 15:52:05 mdw Exp $
+## $Id: Makefile.am,v 1.12 1999/05/04 16:36:03 mdw Exp $

 ##
 ## Makefile for `become'
 ##
 ##
 ## Makefile for `become'
 ##


@@ -29,7 +29,10 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $

-## Revision 1.11  1998/06/18 15:52:05  mdw
+## Revision 1.12  1999/05/04 16:36:03  mdw
+## Changes for new Automake version.
+##
+## Revision 1.11  1998/06/18  15:52:05  mdw

 ## Remove the IDEA test case.
 ##
 ## Revision 1.10  1998/04/23 13:17:17  mdw
 ## Remove the IDEA test case.
 ##
 ## Revision 1.10  1998/04/23 13:17:17  mdw


@@ -73,13 +76,13 @@
 ## --- What to make ---
 
 bin_PROGRAMS = become keygen bcquery
 ## --- What to make ---
 
 bin_PROGRAMS = become keygen bcquery

-noinst_LIBRARIES = bcm
+noinst_LIBRARIES = libbcm.a

 
 ##----- Building the main code ----------------------------------------------
 
 ## --- The library contains most of the interesting stuff ---
 
 
 ##----- Building the main code ----------------------------------------------
 
 ## --- The library contains most of the interesting stuff ---
 

-bcm_SOURCES = \
+libbcm_a_SOURCES = \

        check.c daemon.c \
        lexer.l parser.y \
        class.c name.c netg.c rule.c sym.c userdb.c ypstuff.c \
        check.c daemon.c \
        lexer.l parser.y \
        class.c name.c netg.c rule.c sym.c userdb.c ypstuff.c \


@@ -90,7 +93,7 @@ bcm_SOURCES = \
        \
        become.h \
        check.h daemon.h \
        \
        become.h \
        check.h daemon.h \

-       lexer.h parser.h \
+       lexer.h parse.h \

        class.h name.h netg.h rule.h sym.h userdb.h ypstuff.h \
        crypt.h \
        noise.h rand.h \
        class.h name.h netg.h rule.h sym.h userdb.h ypstuff.h \
        crypt.h \
        noise.h rand.h \


@@ -98,19 +101,16 @@ bcm_SOURCES = \
        mdwopt.h tx.h utils.h \
        dbutils.h
 
        mdwopt.h tx.h utils.h \
        dbutils.h
 

-BUILT_SOURCES = \
-       parser.c lexer.c parser.tab.h
-

 ## --- Yaccing and lexing ---
 
 ## --- Yaccing and lexing ---
 

-$(srcdir)/parser.c $(srcdir)/parser.tab.h: $(srcdir)/parser.y
-       @YACC@ -d -v $(srcdir)/parser.y
-       mv y.tab.c $(srcdir)/parser.c
-       mv y.tab.h $(srcdir)/parser.tab.h
+YFLAGS = -d -v
+
+BUILT_SOURCES = parser.c parser.h lexer.c

 
 

-$(srcdir)/lexer.c: $(srcdir)/lexer.l
-       @LEX@ $(srcdir)/lexer.l
-       mv lex.yy.c $(srcdir)/lexer.c
+dist-hook:
+       for i in $(BUILT_SOURCES); do \
+         [ -r $(distdir)/$$i ] || ln $$i $(distdir)/$$i; \
+       done

 
 ## --- The main programs ---
 
 
 ## --- The main programs ---
 


@@ -126,7 +126,7 @@ bcquery_DEPENDENCIES = libbcm.a
 
 ##----- Become must be setuid root ------------------------------------------
 
 
 ##----- Become must be setuid root ------------------------------------------
 

-install-data-hook:
+install-exec-hook:

        become_prog=${bindir}/`echo become|sed '${transform}'`; \
        { chown root $${become_prog} && \
          chmod 4755 $${become_prog}; } || \
        become_prog=${bindir}/`echo become|sed '${transform}'`; \
        { chown root $${become_prog} && \
          chmod 4755 $${become_prog}; } || \