diff options
| author | bustico | 2008-05-06 14:36:21 +0000 |
|---|---|---|
| committer | bustico | 2008-05-06 14:36:21 +0000 |
| commit | efd3b1deb9efef9a16544e343dfca6109bc23e67 (patch) | |
| tree | b14488a0d9f08931ea4fbf1718978056043e303c /src | |
| parent | eef724f3d0e751fb61be907c09d553a4beab4501 (diff) | |
| download | ivy-c-efd3b1deb9efef9a16544e343dfca6109bc23e67.zip ivy-c-efd3b1deb9efef9a16544e343dfca6109bc23e67.tar.gz ivy-c-efd3b1deb9efef9a16544e343dfca6109bc23e67.tar.bz2 ivy-c-efd3b1deb9efef9a16544e343dfca6109bc23e67.tar.xz | |
fix Makefile for non omp target
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 7 | ||||
| -rw-r--r-- | src/ivy.c | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index 1bbe910..686055b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -127,7 +127,7 @@ TARGETLIBS=libivy.so.$(MAJOR).$(MINOR) libgivy.so.$(MAJOR).$(MINOR) libxtivy.so. .cpp.o: $(CPP) $(CFLAGS) $(BUGGY_DEBIAN_OPTION) -c $*.cpp -all: static-libs commands shared-libs pkgconf tools +all: static-libs shared-libs pkgconf tools libomp: libivy_omp.a libivy_omp.so.$(MAJOR).$(MINOR) omp: libomp @(cd $(TOOLS_DIR) && $(MAKE) omp) @@ -138,7 +138,6 @@ static-libs: libivy.a libgivy.a libxtivy.a libglibivy.a libtclivy.a shared-libs: $(TARGETLIBS) # not yet need Modified Glut libglutivy.so.$(MAJOR).$(MINOR) -commands: $(TARGETS) ivybind.o: ivybind.c $(CC) -c $(CFLAGS) $(REGEXP) $(PCREINC) ivybind.c @@ -312,8 +311,10 @@ installdocs: install: installlibs installbins installliblinks installdocs includes installpkgconf install_omp: installlibs_omp installbins_omp -tools: static-libs libomp +tools: static-libs @(cd $(TOOLS_DIR) && $(MAKE)) +tools_omp: libomp + @(cd $(TOOLS_DIR) && $(MAKE) omp) rpm:: /usr/bin/rpmize @@ -16,8 +16,7 @@ */ /* - TODO : ° mettre à jour la doc / site web - ° faire un configure + TODO : ° faire un configure */ #ifdef OPENMP |