make libprograms work

diff --git a/automake.in b/automake.in
index 123e3e0..71a4caa 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -75,16 +75,16 @@ do
   cat $AM_DIR/header-vars.am >&4
   cat $AM_DIR/header.am >&5
 
-  target_distname=default
   DEFS= INCLUDES= CPPFLAGS= CFLAGS=
-  SOURCES= CONFIG_HEADER= SUBDIRS= PROGRAMS= LIBRARIES= TEXINFOS= MANS=
+  SOURCES= CONFIG_HEADER= SUBDIRS= PROGRAMS= LIBPROGRAMS=
+  LIBRARIES= TEXINFOS= MANS=
 
   eval `sed -n -f $am_rmnl ${am_makefile}.am | sed -n -f $am_ass`
 
-  if test -n "$PROGRAMS" || test -n "$LIBRARIES"; then
+  if test -n "$PROGRAMS$LIBPROGRAMS$LIBRARIES"; then
     cat $AM_DIR/compile-vars.am >&4
     cat $AM_DIR/compile.am >&5
-    for am_file in $PROGRAMS $LIBRARIES; do
+    for am_file in $PROGRAMS $LIBPROGRAMS $LIBRARIES; do
       if grep "^[       ]*${am_file}_SOURCES[   ]*=" ${am_makefile}.am >/dev/null; then
         if grep "^[     ]*${am_file}_OBJECTS[   ]*=" ${am_makefile}.am >/dev/null; then
           :
@@ -114,11 +114,18 @@ ${am_file}_OBJECTS = ${am_file}.\${kr}o" >&4
     done
   fi
 
-  if test -n "$PROGRAMS"; then
-    cat $AM_DIR/programs-vars.am >&4
-    cat $AM_DIR/programs.am >&5
-    for am_prog in $PROGRAMS; do
-      sed "s/@PROGRAM@/$am_prog/g" $AM_DIR/program.am >&5
+  if test -n "$PROGRAMS$LIBPROGRAMS"; then
+    if test -n "$PROGRAMS"; then
+      cat $AM_DIR/programs-vars.am >&4
+      cat $AM_DIR/programs.am >&5
+    fi
+    if test -n "$LIBPROGRAMS"; then
+      cat $AM_DIR/libprograms-vars.am >&4
+      cat $AM_DIR/libprograms.am >&5
+    fi
+    for am_prog in $PROGRAMS $LIBPROGRAMS; do
+      eval "test \"\$target_$am_prog\" != explicit" &&
+        sed "s/@PROGRAM@/$am_prog/g" $AM_DIR/program.am >&5
     done
   fi
 

diff --git a/clean.am b/clean.am
index a7759d9..2e4d44b 100644 (file)
--- a/clean.am
+++ b/clean.am
@@ -2,7 +2,7 @@ mostlyclean:
        rm -f *.o *.krc *.krh krtmp*.c core
 
 clean: mostlyclean
-       rm -f $(PROGRAMS) $(LIBFILES) $(TEXFILES) $(CLEANFILES)
+       rm -f $(PROGRAMS) $(LIBPROGRAMS) $(LIBFILES) $(TEXFILES) $(CLEANFILES)
 
 distclean: clean
        rm -f Makefile *.tab.c $(DISTCLEANFILES)

diff --git a/compile-vars.am b/compile-vars.am
index 24011f6..df68a61 100644 (file)
--- a/compile-vars.am
+++ b/compile-vars.am
@@ -5,4 +5,6 @@ ANSI2KNR = ./ansi2knr
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@ ${LDADD}
+LIBS = @LIBS@
 

diff --git a/header-vars.am b/header-vars.am
index 97e68a5..a43a6e3 100644 (file)
--- a/header-vars.am
+++ b/header-vars.am
@@ -28,4 +28,4 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 transform = @program_transform_name@
 
-ALL = ${PROGRAMS} ${LIBFILES}
+ALL = ${PROGRAMS} ${LIBPROGRAMS} ${LIBFILES}

diff --git a/lib/am/clean.am b/lib/am/clean.am
index a7759d9..2e4d44b 100644 (file)
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -2,7 +2,7 @@ mostlyclean:
        rm -f *.o *.krc *.krh krtmp*.c core
 
 clean: mostlyclean
-       rm -f $(PROGRAMS) $(LIBFILES) $(TEXFILES) $(CLEANFILES)
+       rm -f $(PROGRAMS) $(LIBPROGRAMS) $(LIBFILES) $(TEXFILES) $(CLEANFILES)
 
 distclean: clean
        rm -f Makefile *.tab.c $(DISTCLEANFILES)

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 97e68a5..a43a6e3 100644 (file)
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -28,4 +28,4 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 transform = @program_transform_name@
 
-ALL = ${PROGRAMS} ${LIBFILES}
+ALL = ${PROGRAMS} ${LIBPROGRAMS} ${LIBFILES}

diff --git a/libprograms.am b/libprograms.am
index fe52780..8fc3b00 100644 (file)
--- a/libprograms.am
+++ b/libprograms.am
@@ -1,15 +1,15 @@
-install:: install-programs
+install:: install-libprograms
 
-install-programs: $(PROGRAMS)
-       $(top_srcdir)/mkinstalldirs $(bindir)
-       for p in $(PROGRAMS); do \
-         $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+install-libprograms: $(LIBPROGRAMS)
+       $(top_srcdir)/mkinstalldirs $(libexecdir)
+       for p in $(LIBPROGRAMS); do \
+         $(INSTALL_LIBPROGRAM) $$p $(libexecdir)/`echo $$p|sed '$(transform)'`; \
        done
 
-uninstall:: uninstall-programs
+uninstall:: uninstall-libprograms
 
-uninstall-programs:
-       for p in $(PROGRAMS); do \
-         rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
+uninstall-libprograms:
+       for p in $(LIBPROGRAMS); do \
+         rm -f $(libexecdir)/`echo $$p|sed '$(transform)'`; \
        done