do not include rpcgen'erated files in dist, and make the rules more BSD friendly

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1228 7ae35d74-ebe9-4afe-98af-79ac388436b8

rpcrig/Makefile.am

@@ -4,48 +4,51 @@
 # Note: automake complains rpcrig_xdr.c is generated both with and 
 #  without libtool, hence the copy rpcrig_xdr_lt.c
 
-RPCRIG_SVC = rpcrig_xdr.c rpcrig_svc.c rpcrig_proc.c rpcrigd.c
-RPCRIG_CLNT = rpcrig_xdr_lt.c rpcrig_clnt.c rpcrig_backend.c
-
-LDADD = ../src/libhamlib.la  @NET_LIBS@
+LDADD = ../src/libhamlib.la ../lib/libmisc.la @NET_LIBS@
 DEPENDENCIES = ../src/libhamlib.la 
 
+BUILT_SOURCES=rpcrig_xdr.c rpcrig_svc.c  rpcrig_xdr_lt.c rpcrig_clnt.c  rpcrig.h
+
 # The RPC server
 sbin_PROGRAMS = rpc.rigd
 rpc_rigd_DEPENDENCIES = $(DEPENDENCIES) @BACKENDEPS@
-rpc_rigd_SOURCES = $(RPCRIG_SVC)
+rpc_rigd_SOURCES = rpcrig_proc.c rpcrigd.c
+nodist_rpc_rigd_SOURCES = rpcrig_xdr.c rpcrig_svc.c rpcrig.h
 rpc_rigd_LDFLAGS = @BACKENDLNK@
 man_MANS = rpc.rigd.8
 
 # The RPC backend
 lib_LTLIBRARIES = libhamlib-rpcrig.la
-libhamlib_rpcrig_la_SOURCES = $(RPCRIG_CLNT)
+libhamlib_rpcrig_la_SOURCES = rpcrig_backend.c rpcrig_backend.h
+nodist_libhamlib_rpcrig_la_SOURCES = rpcrig_xdr_lt.c rpcrig_clnt.c rpcrig.h
 libhamlib_rpcrig_la_LDFLAGS = -no-undefined -module -version-info 0:0:0
 libhamlib_rpcrig_la_LIBADD = ../src/libhamlib.la @NET_LIBS@
 
 
-noinst_HEADERS = rpcrig.h rpcrig_backend.h
-
 EXTRA_DIST = rpcrig.x $(man_MANS)
 
 RPCGEN = rpcgen
 
 rpcrig.h: rpcrig.x
 	rm -f $@
-	$(RPCGEN) -h $< -o $@
+	$(RPCGEN) -h rpcrig.x -o $@
 
 rpcrig_clnt.c: rpcrig.x rpcrig.h
 	rm -f $@
-	$(RPCGEN) -l $< -o $@
+	$(RPCGEN) -l rpcrig.x -o $@
 
 rpcrig_svc.c: rpcrig.x rpcrig.h
 	rm -f $@
-	$(RPCGEN) -m $< -o $@
+	$(RPCGEN) -m rpcrig.x -o $@
+
+# note: 
+# we need 2 rpcrig_xdr.c's: one for static rpcrig deamon, one for lt backend
 
 rpcrig_xdr.c: rpcrig.x rpcrig.h
 	rm -f $@
-	$(RPCGEN) -c $< -o $@
+	$(RPCGEN) -c rpcrig.x -o $@
 
-rpcrig_xdr_lt.c: rpcrig_xdr.c
-	cp -f $< $@
+rpcrig_xdr_lt.c: rpcrig.x rpcrig.h
+	rm -f $@
+	$(RPCGEN) -c rpcrig.x -o $@
 

rpcrot/Makefile.am

@@ -4,48 +4,51 @@
 # Note: automake complains rpcrot_xdr.c is generated both with and
 #  without libtool, hence the copy rpcrot_xdr_lt.c
 
-RPCROT_SVC = rpcrot.h rpcrot_xdr.c rpcrot_svc.c rpcrot_proc.c rpcrotd.c
-RPCROT_CLNT = rpcrot.h rpcrot_xdr_lt.c rpcrot_clnt.c rpcrot_backend.c
-
-LDADD = ../src/libhamlib.la @NET_LIBS@
+LDADD = ../src/libhamlib.la ../lib/libmisc.la @NET_LIBS@
 DEPENDENCIES = ../src/libhamlib.la 
 
+BUILT_SOURCES=rpcrot_xdr.c rpcrot_svc.c  rpcrot_xdr_lt.c rpcrot_clnt.c  rpcrot.h
+
 # The RPC server
 sbin_PROGRAMS = rpc.rotd
 rpc_rotd_DEPENDENCIES = $(DEPENDENCIES) @ROT_BACKENDEPS@
-rpc_rotd_SOURCES = $(RPCROT_SVC)
+rpc_rotd_SOURCES = rpcrot_proc.c rpcrotd.c
+nodist_rpc_rotd_SOURCES = rpcrot_xdr.c rpcrot_svc.c rpcrot.h
 rpc_rotd_LDFLAGS = @ROT_BACKENDLNK@
 man_MANS = rpc.rotd.8
 
 # The RPC backend
 lib_LTLIBRARIES = libhamlib-rpcrot.la
-libhamlib_rpcrot_la_SOURCES = $(RPCROT_CLNT)
+libhamlib_rpcrot_la_SOURCES = rpcrot_backend.c rpcrot_backend.h
+nodist_libhamlib_rpcrot_la_SOURCES = rpcrot_xdr_lt.c rpcrot_clnt.c rpcrot.h
 libhamlib_rpcrot_la_LDFLAGS = -no-undefined -module -version-info 0:0:0
 libhamlib_rpcrot_la_LIBADD = ../src/libhamlib.la @NET_LIBS@
 
 
-noinst_HEADERS = rpcrot.h rpcrot_backend.h
-
 EXTRA_DIST = rpcrot.x $(man_MANS)
 
 RPCGEN = rpcgen
 
 rpcrot.h: rpcrot.x
 	rm -f $@
-	$(RPCGEN) -h $< -o $@
+	$(RPCGEN) -h rpcrot.x -o $@
 
 rpcrot_clnt.c: rpcrot.x rpcrot.h
 	rm -f $@
-	$(RPCGEN) -l $< -o $@
+	$(RPCGEN) -l rpcrot.x -o $@
 
 rpcrot_svc.c: rpcrot.x rpcrot.h
 	rm -f $@
-	$(RPCGEN) -m $< -o $@
+	$(RPCGEN) -m rpcrot.x -o $@
+
+# note:
+# we need 2 rpcrot_xdr.c's: one for static rpcrot deamon, one for lt backend
 
 rpcrot_xdr.c: rpcrot.x rpcrot.h
 	rm -f $@
-	$(RPCGEN) -c $< -o $@
+	$(RPCGEN) -c rpcrot.x -o $@
 
-rpcrot_xdr_lt.c: rpcrot_xdr.c
-	cp -f $< $@
+rpcrot_xdr_lt.c: rpcrot.x rpcrot.h
+	rm -f $@
+	$(RPCGEN) -c rpcrot.x -o $@