--- a/daemons/Makefile.am
+++ b/daemons/Makefile.am
@@ -1,41 +1,30 @@
-## Process this file with automake to produce Makefile.in
-ACLOCAL_AMFLAGS         = -I m4
+## $Id: Makefile.am,v 1.1 1999/04/29 21:16:54 columbus Exp $
 
-AM_CPPFLAGS             = -I$(top_srcdir) -I$(top_srcdir)/lib -Wall
-AM_CPPFLAGS             += -Wp,-D_FORTIFY_SOURCE=2
-AM_LDFLAGS              = -lpthread $(SYSTEMD_LIBS)
+## Process this file with automake to produce Makefile.in 
 
-CLEANFILES              = *~
+## these are used by programs in the tools directory, but not by
+## programs in this directory.  So we must make sure they get distributed
 
-varrundir               = $(localstatedir)/run
+EXTRA_DIST = dump_config.c dump_config.h
 
-bin_PROGRAMS            = lircrcd
+sbin_PROGRAMS = lircd lircmd
 
-lircrcd_SOURCES         = lircrcd.cpp
-lircrcd_LDADD           = ../lib/liblirc_client.la
+lircd_SOURCES = lircd.c ir_remote.c config_file.c \
+                lircd.h ir_remote.h config_file.h
+lircmd_SOURCES = lircmd.c
 
-sbin_PROGRAMS           = lircd lircmd
+install-exec-local: mkdev
+uninstall-local: rmdev
 
-lircd_SOURCES           = lircd.cpp
-lircd_LDADD             = ../lib/liblirc.la
+mkdev:
+	test -e @devdir@/lircd || @mknod@ @devdir@/lircd p
+	test -e @devdir@/lircm || @mknod@ @devdir@/lircm p
 
-lircmd_SOURCES          = lircmd.cpp
-lircmd_LDADD            = ../lib/liblirc.la
+rmdev:
+	$(RM) @devdir@/lircd
+	$(RM) @devdir@/lircm
 
-noinst_PROGRAMS         = lircd.simsend lircd.simrec
 
-lircd_simsend_SOURCES   = lircd.cpp
-lircd_simsend_CFLAGS    = -DSIM_SEND
-lircd_simsend_LDADD     = ../lib/liblirc.la
-lircd_simrec_SOURCES    = lircd.cpp
-lircd_simrec_CFLAGS     = -DSIM_REC
-lircd_simrec_LDADD      = ../lib/liblirc.la
 
-install-exec-local:
-	test -d  $(DESTDIR)$(varrundir)/$(PACKAGE) \
-		 || mkdir -p $(DESTDIR)$(varrundir)/$(PACKAGE)
-uninstall-local:
-	-$(RM) $(DESTDIR)$(varrundir)/$(PACKAGE)/lircd
+CLEANFILES = *~
 
-checkfiles:
-	../git-tools/checkfiles $(SOURCES)