Fix Makefile.direct after Makefile removal from package.

* .gitignore: Add "base_lib", "c++", "gc.a" files.
* Makefile.direct (Makefile): Add rule to create (or overwrite)
Makefile from Makefile.direct file.
* Makefile.direct (clean): Remove "base_lib", "c++" files as well.

diff --git a/.gitignore b/.gitignore
index e821252ea4e3dcc0ad5df5e0ff3cf146f9bfa939..56205e9c744a4f1f4cf87901aa576ffff3e4e891 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,9 @@
 /.libs/
 /Makefile
 /add_gc_prefix
+/base_lib
 /bdw-gc.pc
+/c++
 /config.log
 /config.status
 /cord/cordtest
@@ -24,6 +26,7 @@
 /core
 /de
 /gc-*
+/gc.a
 /gcname
 /gctest
 /hugetest

diff --git a/Makefile.direct b/Makefile.direct
index ac9342563f9d94cced0cb4618b9d17243cd32ceb..7e05f3065f99da31eaaf5d2459168c1099d7dc38 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -205,6 +205,9 @@ $(OBJS) tests/test.o dyn_load.o dyn_load_sunos53.o: \
 # options affects the size of GC_arrays,
 # invalidating all .o files that rely on gc_priv.h
 
+Makefile: Makefile.direct
+       cp Makefile.direct Makefile
+
 mark.o typd_mlc.o finalize.o ptr_chck.o: $(srcdir)/include/gc_mark.h \
                                         $(srcdir)/include/private/gc_pmark.h
 
@@ -382,7 +385,7 @@ if_not_there: $(srcdir)/extra/if_not_there.c
 clean:
        rm -f gc.a *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \
              setjmp_test  mon.out gmon.out a.out core if_not_there if_mach \
-             threadlibs $(CORD_OBJS) cord/cordtest cord/de
+             base_lib c++ threadlibs $(CORD_OBJS) cord/cordtest cord/de
        -rm -f *~
 
 gctest: tests/test.o gc.a $(UTILS)