diff -ruN openbabel-1.100.0.orig/Makefile.in openbabel-1.100.0/Makefile.in --- openbabel-1.100.0.orig/Makefile.in Mon Dec 2 17:38:50 2002 +++ openbabel-1.100.0/Makefile.in Mon Jul 21 16:06:34 2003 @@ -9,6 +9,8 @@ exec_prefix = @exec_prefix@ mandir = @mandir@/man1 bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ DESTDIR = diff -ruN openbabel-1.100.0.orig/configure openbabel-1.100.0/configure --- openbabel-1.100.0.orig/configure Fri Dec 6 18:53:35 2002 +++ openbabel-1.100.0/configure Mon Jul 21 16:08:10 2003 @@ -4058,7 +4058,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 diff -ruN openbabel-1.100.0.orig/src/Makefile.in openbabel-1.100.0/src/Makefile.in --- openbabel-1.100.0.orig/src/Makefile.in Mon Dec 2 17:21:26 2002 +++ openbabel-1.100.0/src/Makefile.in Mon Jul 21 16:06:34 2003 @@ -4,6 +4,8 @@ exec_prefix = @exec_prefix@ pkgdatadir = @datadir@/openbabel bindir = @bindir@ +libdir = @libdir@ +includedir = @includedir@ DESTDIR = @@ -43,7 +45,7 @@ HDRS = aromatic.h atomtyp.h base.h binary.h \ bitgrid.h bitvec.h chiral.h chains.h cwrap.h \ data.h element.h extable.h fileformat.h grid.h \ - matrix.h mol.h molchrg.h molvector.h oeifstream.h \ + matrix.h mol.h molchrg.h molvector.h \ obutil.h parsmart.h patty.h phmodel.h phmodeldata.h \ resdata.h ring.h rotor.h smi.h typer.h types.h version.h \ chains.h generic.h oberror.h @@ -66,20 +68,24 @@ PROGRAM = babel -LIBRARY = libopenbabel.a +LIBRARY = libopenbabel EXTRA_DIST = bin2hex.pl MAKEFILE = Makefile -$(PROGRAM): $(MAIN) $(LIBRARY) - $(LINKER) $(LDFLAGS) -o $(PROGRAM) $(MAIN) $(LIBRARY) $(LIBS) +$(PROGRAM): $(MAIN) $(LIBRARY).a + $(LINKER) $(LDFLAGS) -o $(PROGRAM) $(MAIN) $(LIBRARY).a $(LIBS) -$(LIBRARY): $(DATAINCS) $(OBJS) $(EXTRAOBJS) - $(AR) -r $(LIBRARY) $(OBJS) $(EXTRAOBJS) - $(RANLIB) $(LIBRARY) +$(LIBRARY).a: $(DATAINCS) $(OBJS) $(EXTRAOBJS) + $(LINKER) -dynamiclib -install_name $(libdir)/$(LIBRARY).1.dylib -compatibility_version 1.0.0 -current_version 1.100.0 -o $(LIBRARY).1.100.0.dylib $(OBJS) $(EXTRAOBJS) + rm -f $(LIBRARY).1.dylib $(LIBRARY).dylib + ln -s $(LIBRARY).1.100.0.dylib $(LIBRARY).1.dylib + ln -s $(LIBRARY).1.100.0.dylib $(LIBRARY).dylib + $(AR) -r $(LIBRARY).a $(OBJS) $(EXTRAOBJS) + $(RANLIB) $(LIBRARY).a -all: $(DATAINCS) $(LIBRARY) $(PROGRAM) +all: $(DATAINCS) $(LIBRARY).a $(PROGRAM) test: check check: $(PROGRAM) @@ -91,7 +97,19 @@ install: $(PROGRAM) $(MKDIRS) $(DESTDIR)$(bindir) - $(INSTALL) $(PROGRAM) $(DESTDIR)$(bindir) + $(INSTALL) -m755 $(PROGRAM) $(DESTDIR)$(bindir) + $(MKDIRS) $(DESTDIR)$(libdir) + $(INSTALL) -m644 $(LIBRARY).a $(DESTDIR)$(libdir) + $(INSTALL) -m644 $(LIBRARY).1.100.0.dylib $(DESTDIR)$(libdir) + ln -s $(LIBRARY).1.100.0.dylib \ + $(DESTDIR)$(libdir)/$(LIBRARY).1.dylib + ln -s $(LIBRARY).1.100.0.dylib \ + $(DESTDIR)$(libdir)/$(LIBRARY).dylib + $(MKDIRS) $(DESTDIR)$(includedir)/openbabel + $(INSTALL) -m644 $(HDRS) $(DESTDIR)$(includedir)/openbabel + $(MKDIRS) $(DESTDIR)$(includedir)/openbabel/math + $(INSTALL) -m644 math/matrix3x3.h $(DESTDIR)$(includedir)/openbabel/math + $(INSTALL) -m644 math/vector3.h $(DESTDIR)$(includedir)/openbabel/math $(MKDIRS) $(DESTDIR)$(pkgdatadir) (cd $(srcdir); $(INSTALL) -m644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)) @@ -129,4 +147,4 @@ .SUFFIXES: .cpp .cpp.o: - $(CXX) $(CXXFLAGS) $(DEFS) $(INCS) -c $< -o $@ + $(CXX) -fno-common $(CXXFLAGS) $(DEFS) $(INCS) -c $< -o $@