diff options
| author | Jeremy Katz <katzj@redhat.com> | 2001-12-03 21:23:16 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2001-12-03 21:23:16 +0000 |
| commit | 08a680ea8c322b4138f23cbdfd477907f091f6d2 (patch) | |
| tree | 39eb83a457df4271eef322e07e139aa285eac945 | |
| parent | 9789f119cdb67c6405c101f5e2a001f3e50fdd49 (diff) | |
| download | anaconda-08a680ea8c322b4138f23cbdfd477907f091f6d2.tar.gz anaconda-08a680ea8c322b4138f23cbdfd477907f091f6d2.tar.xz anaconda-08a680ea8c322b4138f23cbdfd477907f091f6d2.zip | |
we really want a non-diet libisys for post-install (or we have to make sure we don't get weird interactions between the diet isys and the glibc everything else we use)
| -rw-r--r-- | isys/Makefile | 16 | ||||
| -rw-r--r-- | utils/Makefile | 3 |
2 files changed, 9 insertions, 10 deletions
diff --git a/isys/Makefile b/isys/Makefile index 2e6ba769b..46339817b 100644 --- a/isys/Makefile +++ b/isys/Makefile @@ -1,5 +1,7 @@ include ../Makefile.inc +ARCH := $(patsubst i%86,i386,$(shell uname -m)) +ARCH := $(patsubst sparc%,sparc,$(ARCH)) CFLAGS = -ffunction-sections -I$(PYTHONINCLUDE) -I.. -Wall -Os -g -DHAVE_NFS -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o \ @@ -7,19 +9,18 @@ OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o \ lang.o isofs.o pdc.o dns.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 -GENERATED = nfs_mountversion.h +DOBJECTS = $(patsubst %.o,%.do,$(OBJECTS) $(STATICOBJS)) -STATICLIB=libisys.a($(OBJECTS)) +GENERATED = nfs_mountversion.h ifeq ($(ARCH),i386) -STATICLIB=libisys-diet.a($(DOBJECTS)) +DIETLIB=libisys-diet.a endif ifeq ($(ARCH),sparc) @@ -35,7 +36,7 @@ endif everything: $(TARGET) -all: subdirs $(PYMODULES) $(STATICLIB) +all: subdirs $(PYMODULES) libisys.a $(DIETLIB) %.lo: %.c $(CC) -c $(CFLAGS) -fPIC -o $@ $< @@ -51,9 +52,10 @@ _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) - rm -f $(GENERATED) $(DOBJECTS) + rm -f *.o *.so *.lo *.a *.pyc $(TARGET) $(SOBJECTS) $(OBJECTS) $(GENERATED) for d in $(SUBDIRS); do make -C $$d clean; done install: all diff --git a/utils/Makefile b/utils/Makefile index fbd255e84..5136f2caa 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -4,9 +4,6 @@ ARCH := $(patsubst i%86,i386,$(shell uname -m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) ISYSLIB=isys -ifeq ($(ARCH),i386) -ISYSLIB=isys-diet -endif LOADLIBES = -L../isys -l$(ISYSLIB) -lpopt CFLAGS = -Wall -g -I/usr/include/rpm -I.. |