Revision 2207 trunk/src/GNUmakefile

GNUmakefile (revision 2207)
25 25
  LIBSDIR=$(DIST)\lib
26 26
  LIBSDIR:=$(addsuffix \,$(LIBSDIR))
27 27
  ifneq ($(DEBUG),yes)
28
  OBJSDIR=..\build\objects\dist$(SHARED)
28
  OBJSDIR=..\build\objects\dist
29 29
  else
30
  OBJSDIR=..\build\objects\debug$(SHARED)
30
  OBJSDIR=..\build\objects\debug
31 31
  endif
32 32
  OBJSDIR:=$(addsuffix \,$(OBJSDIR))
33 33
  ADMB_VERSION:=$(shell if exist ..\VERSION type ..\VERSION)
......
40 40
  endif
41 41
  LIBSDIR=$(DIST)/lib/
42 42
  ifneq ($(DEBUG),yes)
43
  OBJSDIR=../build/objects/dist$(SHARED)/
43
  OBJSDIR=../build/objects/dist/
44 44
  else
45
  OBJSDIR=../build/objects/debug$(SHARED)/
45
  OBJSDIR=../build/objects/debug/
46 46
  endif
47 47
  ADMB_VERSION:=$(shell cat ../VERSION)
48 48
endif
49
ifdef SHARED
50
  OBJSDIR:=$(addsuffix shared-,$(OBJSDIR))
51
endif
49 52

  
50 53
ifdef CXX
51 54
  USER_CXX:= $(CXX)
......
427 430
ifeq ($(SHELL),cmd)
428 431
	if not exist $(OBJSDIR) md $(OBJSDIR)
429 432
else
430
	mkdir -p $(OBJSDIR)
433
  ifneq ($(DEBUG),yes)
434
	mkdir -p ../build/objects/dist/
435
  else
436
	mkdir -p ../build/objects/debug/
437
  endif
431 438
endif
432 439

  
433 440
clean:

Also available in: Unified diff