diff options
| author | Erik Troan <ewt@redhat.com> | 2001-11-15 14:44:22 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 2001-11-15 14:44:22 +0000 |
| commit | c59dc9b741ad11bfe72930d8d26f3a5c686641bc (patch) | |
| tree | 591b54009230341073cb17a2bd8e5f46ea866f64 /isys | |
| parent | 7e5a7983df3fe8043114727b6dfe17a823ed0611 (diff) | |
| download | anaconda-c59dc9b741ad11bfe72930d8d26f3a5c686641bc.tar.gz anaconda-c59dc9b741ad11bfe72930d8d26f3a5c686641bc.tar.xz anaconda-c59dc9b741ad11bfe72930d8d26f3a5c686641bc.zip | |
don't build libisys.a on i386; fixed make clean
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/isys/Makefile b/isys/Makefile index 7810471a2..26f8cd0be 100644 --- a/isys/Makefile +++ b/isys/Makefile @@ -9,18 +9,19 @@ OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o \ lang.o isofs.o pdc.o SOBJECTS = $(patsubst %.o,%.lo,$(OBJECTS)) SOURCES = $(patsubst %.o,%.c,$(OBJECTS)) isys.c +DOBJECTS = $(patsubst %.o,%.do,$(OBJECTS) $(STATICOBJS)) STATICOBJS = otherinsmod.o LOADLIBES = -lresolv -lz -lpci -lpopt -lpump -lext2fs -L./gzlib -lgunzip PYMODULES = _isys.so SUBDIRS = modutils gzlib DIET = diet -DOBJECTS = $(patsubst %.o,%.do,$(OBJECTS) $(STATICOBJS)) - GENERATED = nfs_mountversion.h +STATICLIB=libisys.a($(OBJECTS)) + ifeq ($(ARCH),i386) -DIETLIB=libisys-diet.a +STATICLIB=libisys-diet.a($(DOBJECTS)) endif ifeq ($(ARCH),sparc) @@ -36,7 +37,7 @@ endif everything: $(TARGET) -all: subdirs $(PYMODULES) libisys.a $(DIETLIB) +all: subdirs $(PYMODULES) libisys.a %.lo: %.c $(CC) -c $(CFLAGS) -fPIC -o $@ $< @@ -52,10 +53,9 @@ _silo.so: silo.c libisys.a: libisys.a($(OBJECTS) $(STATICOBJS)) -libisys-diet.a: libisys-diet.a($(DOBJECTS)) - clean: - rm -f *.o *.so *.lo *.a *.pyc $(TARGET) $(SOBJECTS) $(OBJECTS) $(GENERATED) + rm -f *.o *.so *.lo *.a *.pyc $(TARGET) $(SOBJECTS) $(OBJECTS) + rm -f $(GENERATED) $(DOBJECTS) for d in $(SUBDIRS); do make -C $$d clean; done install: all |