diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2011-03-13 15:34:13 +0000 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2011-03-13 15:34:13 +0000 |
| commit | daa40206871fde7e4bb0ce248aeee64872f5ae21 (patch) | |
| tree | b0305677096888bcec833b5118e0e721ca5015a5 /src/main | |
| parent | cfe6a45c9ea1ce4f9e6a67b50faea1b328e7d84d (diff) | |
| download | vhc-daa40206871fde7e4bb0ce248aeee64872f5ae21.tar.gz vhc-daa40206871fde7e4bb0ce248aeee64872f5ae21.tar.bz2 vhc-daa40206871fde7e4bb0ce248aeee64872f5ae21.zip | |
Modification des makefiles.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/Makefile b/src/main/Makefile index 20a44ec..c6dc1e1 100644 --- a/src/main/Makefile +++ b/src/main/Makefile @@ -13,7 +13,9 @@ LOCALDIR = main # ==> Ajouter ici les objets a compiler # Si un objet necessite une compilation non-standard (i.e. pas de regle du style Foo.o : Foo.cc Foo.h), rajouter # cette regle. -OBJS = Vector3D.o Particle.o +LOCALOBJS = Vector3D.o Particle.o +OBJS=$(addprefix $(BINDIR)/$(LOCALDIR)/,$(LOCALOBJS)) +.PHONY = lib all: checkdirs lib @@ -27,9 +29,9 @@ $(BINDIR)/$(LOCALDIR): # Cree une librairie statique des fichiers objets lib: $(OBJS) @echo "Packing library..." - ar rcs $(BINDIR)/$(LOCALDIR)/libvhc.a $(addprefix $(BINDIR)/$(LOCALDIR)/,$(OBJS)) + ar rcs $(BINDIR)/$(LOCALDIR)/libvhc.a $(OBJS) @echo "Done packing library." # Regle implicite qui modifie le repertoire de destination des fichiers .o -%.o: %.cc - $(CXX) $(CXXFLAGS) -c $< -o $(BINDIR)/$(LOCALDIR)/$@
\ No newline at end of file +$(BINDIR)/$(LOCALDIR)/%.o: %.cc + $(CXX) $(CXXFLAGS) -c $< -o $@
\ No newline at end of file |