More makefile fixes.

diff --git a/lustre/mdc/Makefile.am b/lustre/mdc/Makefile.am
index d75fc2f..e149246 100644 (file)
--- a/lustre/mdc/Makefile.am
+++ b/lustre/mdc/Makefile.am
@@ -9,17 +9,17 @@ MODULE = mdc
 modulefs_DATA = mdc.o
 EXTRA_PROGRAMS = mdc
 
 modulefs_DATA = mdc.o
 EXTRA_PROGRAMS = mdc
 

-LINX= mds_updates.c ll_pack.c lov_pack.c 
-mdc_SOURCES =  mdc_request.c mdc_reint.c ../lib/client.c $(LINX)
+LINX= mds_updates.c ll_pack.c lov_pack.c client.c
+mdc_SOURCES =  mdc_request.c mdc_reint.c $(LINX)

 
 lov_pack.c: 
        test -e lov_pack.c || ln -sf $(top_srcdir)/lib/lov_pack.c .
 
 lov_pack.c: 
        test -e lov_pack.c || ln -sf $(top_srcdir)/lib/lov_pack.c .

-

 ll_pack.c: 
        test -e ll_pack.c || ln -sf $(top_srcdir)/lib/ll_pack.c .
 ll_pack.c: 
        test -e ll_pack.c || ln -sf $(top_srcdir)/lib/ll_pack.c .

-

 mds_updates.c: 
        test -e mds_updates.c || ln -sf $(top_srcdir)/lib/mds_updates.c .
 mds_updates.c: 
        test -e mds_updates.c || ln -sf $(top_srcdir)/lib/mds_updates.c .

+client.c: 
+       test -e client.c || ln -sf $(top_srcdir)/lib/client.c .

 
 
 include $(top_srcdir)/Rules
 
 
 include $(top_srcdir)/Rules

diff --git a/lustre/osc/Makefile.am b/lustre/osc/Makefile.am
index 6db3a2a..5c0557e 100644 (file)
--- a/lustre/osc/Makefile.am
+++ b/lustre/osc/Makefile.am
@@ -9,14 +9,15 @@ MODULE = osc
 modulefs_DATA = osc.o
 EXTRA_PROGRAMS = osc
 
 modulefs_DATA = osc.o
 EXTRA_PROGRAMS = osc
 

-LINX= obd_pack.c ll_pack.c
-osc_SOURCES = osc_request.c ../lib/client.c $(LINX)
+LINX= obd_pack.c ll_pack.c client.c
+osc_SOURCES = osc_request.c $(LINX)

 
 obd_pack.c: 
        test -e obd_pack.c || ln -sf $(top_srcdir)/lib/obd_pack.c
 
 obd_pack.c: 
        test -e obd_pack.c || ln -sf $(top_srcdir)/lib/obd_pack.c

-

 ll_pack.c: 
        test -e ll_pack.c || ln -sf $(top_srcdir)/lib/ll_pack.c
 ll_pack.c: 
        test -e ll_pack.c || ln -sf $(top_srcdir)/lib/ll_pack.c

+client.c: 
+       test -e client.c || ln -sf $(top_srcdir)/lib/client.c

 
 dist-hook:
        list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done
 
 dist-hook:
        list='$(LINX)'; for f in $$list; do rm -f $(distdir)/$$f; done