4 files changed, 36 insertions, 71 deletions
diff --git a/file_io/os2/.cvsignore b/file_io/os2/.cvsignore
index f3c7a7c5d..06e18a7aa 100644
--- a/file_io/os2/.cvsignore
+++ b/file_io/os2/.cvsignore
@@ -1 +1,3 @@
 Makefile
+*.lo
+.libs
diff --git a/file_io/os2/Makefile.in b/file_io/os2/Makefile.in
index f413b3dac..50c758437 100644
--- a/file_io/os2/Makefile.in
+++ b/file_io/os2/Makefile.in
@@ -1,45 +1,22 @@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+	dir.lo \
+	fileacc.lo \
+	filedup.lo \
+	filestat.lo \
+	open.lo \
+	pipe.lo \
+	readwrite.lo \
+	seek.lo \
+	flock.lo \
+	maperrorcode.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
 INCDIR=../../include
 OSDIR=$(INCDIR)/arch/@OSDIR@
 DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
 INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-LIB=file.a
-
-OBJS=dir.o \
-	fileacc.o \
-	filedup.o \
-	filestat.o \
-	open.o \
-	pipe.o \
-	readwrite.o \
-	seek.o \
-	flock.o \
-	maperrorcode.o
-
-.c.o:
-	$(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(LIB)
-
-clean:
-	$(RM) -f *.o *.a *.so
-
-distclean: clean
-	-$(RM) -f Makefile
-
-
-$(LIB): $(OBJS)
-	$(RM) -f $@
-	$(AR) cr $@ $(OBJS)
-	$(RANLIB) $@
-
-depend:
-	$(MKDEP) $(INCLUDES) $(CFLAGS) *.c
 
 # DO NOT REMOVE
diff --git a/file_io/unix/.cvsignore b/file_io/unix/.cvsignore
index f3c7a7c5d..06e18a7aa 100644
--- a/file_io/unix/.cvsignore
+++ b/file_io/unix/.cvsignore
@@ -1 +1,3 @@
 Makefile
+*.lo
+.libs
diff --git a/file_io/unix/Makefile.in b/file_io/unix/Makefile.in
index d437f0157..d612ce198 100644
--- a/file_io/unix/Makefile.in
+++ b/file_io/unix/Makefile.in
@@ -1,38 +1,22 @@
-RM=@RM@
-CC=@CC@
-RANLIB=@RANLIB@
-CFLAGS=@CFLAGS@ @OPTIM@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ $(LIBS)
+
+TARGETS = \
+	dir.lo \
+	fileacc.lo \
+	filedup.lo \
+	filestat.lo \
+	flock.lo \
+	fullrw.lo \
+	open.lo \
+	pipe.lo \
+	readwrite.lo \
+	seek.lo
+
+# bring in rules.mk for standard functionality
+@INCLUDE_RULES@
+
 INCDIR=../../include
 OSDIR=$(INCDIR)/arch/@OSDIR@
 DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
 INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
-MKDEP=../../helpers/mkdep.sh
-
-OBJS=dir.o \
-	fileacc.o \
-	filedup.o \
-	filestat.o \
-	flock.o \
-	fullrw.o \
-	open.o \
-	pipe.o \
-	readwrite.o \
-	seek.o
-
-.c.o:
-	$(CC) $(CFLAGS) -c $(INCLUDES) $<
-
-all: $(OBJS)
-
-clean:
-	$(RM) -f *.o *.a *.so
-
-distclean: clean
-	-$(RM) -f Makefile
-
-depend:
-	$(MKDEP) $(INCLUDES) $(CFLAGS) *.c
 
 # DO NOT REMOVE