Revision 2207

trunk/contrib/GNUmakefile (revision 2207)
18 18
ifeq ($(SHELL),cmd)
19 19
  ifneq ($(DEBUG),yes)
20 20
  CONTRIB_DIR=..\..\build\dist\contrib
21
  CONTRIB_OBJS_DIR=..\..\build\objects\contrib$(SHARED)
21
  CONTRIB_OBJS_DIR=..\..\build\objects\dist\contrib$(SHARED)
22 22
  else
23 23
  CONTRIB_DIR=..\..\build\debug\contrib
24 24
  CONTRIB_OBJS_DIR=..\..\build\objects\debug\contrib$(SHARED)
......
29 29
else
30 30
  ifneq ($(DEBUG),yes)
31 31
  CONTRIB_DIR=../../build/dist/contrib
32
  CONTRIB_OBJS_DIR=../../build/objects/contrib$(SHARED)
32
  CONTRIB_OBJS_DIR=../../build/objects/dist/contrib$(SHARED)
33 33
  else
34 34
  CONTRIB_DIR=../../build/debug/contrib
35 35
  CONTRIB_OBJS_DIR=../../build/objects/debug/contrib$(SHARED)
......
95 95
contrib-libs: contrib-ecolib contrib-gdbprintlib contrib-qfclib contrib-statslib contrib-src
96 96
ifeq ($(SHELL),cmd)
97 97
	if exist  src\$(CONTRIB_LIB)\libcontrib$(SHARED).a del src\$(CONTRIB_LIB)\libcontrib.a
98
	$(AR) -rs src\$(CONTRIB_LIB)\libcontrib$(SHARED).a src\$(CONTRIB_OBJS_DIR)\saflp-contrib-*.obj
98
	$(AR) -rs src\$(CONTRIB_LIB)\libcontrib$(SHARED).a src\$(CONTRIB_OBJS_DIR)-saflp-*.obj
99 99
	if exist  src\$(CONTRIB_LIB)\libcontribo$(SHARED).a del src\$(CONTRIB_LIB)\libcontribo.a
100
	$(AR) -rs src\$(CONTRIB_LIB)\libcontribo$(SHARED).a src\$(CONTRIB_OBJS_DIR)\optlp-contrib-*.obj
100
	$(AR) -rs src\$(CONTRIB_LIB)\libcontribo$(SHARED).a src\$(CONTRIB_OBJS_DIR)-optlp-*.obj
101 101
else
102 102
	rm -vf src/$(CONTRIB_LIB)/libcontrib$(SHARED).a
103
	$(AR) -rs src/$(CONTRIB_LIB)/libcontrib$(SHARED).a src/$(CONTRIB_OBJS_DIR)/saflp-contrib-*.obj
103
	$(AR) -rs src/$(CONTRIB_LIB)/libcontrib$(SHARED).a src/$(CONTRIB_OBJS_DIR)-saflp-*.obj
104 104
	rm -vf src/$(CONTRIB_LIB)/libcontribo$(SHARED).a
105
	$(AR) -rs src/$(CONTRIB_LIB)/libcontribo$(SHARED).a src/$(CONTRIB_OBJS_DIR)/optlp-contrib-*.obj
105
	$(AR) -rs src/$(CONTRIB_LIB)/libcontribo$(SHARED).a src/$(CONTRIB_OBJS_DIR)-optlp-*.obj
106 106
endif
107 107

  
108 108
contrib-ad2csv: contrib-dirs
......
125 125

  
126 126
contrib-dirs:
127 127
ifeq ($(SHELL),cmd)
128
	if not exist src\$(CONTRIB_OBJS_DIR) md src\$(CONTRIB_OBJS_DIR)
128
	#if not exist src\$(CONTRIB_OBJS_DIR) md src\$(CONTRIB_OBJS_DIR)
129 129
	if not exist src\$(CONTRIB_DIR) md src\$(CONTRIB_DIR)
130 130
	if not exist src\$(CONTRIB_BIN) md src\$(CONTRIB_BIN)
131 131
	if not exist src\$(CONTRIB_INCLUDE) md src\$(CONTRIB_INCLUDE)
132 132
	if not exist src\$(CONTRIB_LIB) md src\$(CONTRIB_LIB)
133 133
else
134
	mkdir -p src/$(CONTRIB_OBJS_DIR)
134
	#mkdir -p src/$(CONTRIB_OBJS_DIR)
135 135
	mkdir -p src/$(CONTRIB_DIR)
136 136
	mkdir -p src/$(CONTRIB_BIN)
137 137
	mkdir -p src/$(CONTRIB_INCLUDE)
trunk/contrib/admb-rules.mak (revision 2207)
7 7
endif
8 8

  
9 9
ifeq ($(SHELL),cmd)
10
all: $(addprefix $(CONTRIB_OBJS_DIR)\saflp-contrib-, $(OBJECTS)) $(addprefix $(CONTRIB_OBJS_DIR)\optlp-contrib-, $(OBJECTS))
10
all: $(addprefix $(CONTRIB_OBJS_DIR)-saflp-, $(OBJECTS)) $(addprefix $(CONTRIB_OBJS_DIR)-optlp-, $(OBJECTS))
11 11

  
12
$(CONTRIB_OBJS_DIR)\saflp-contrib-%.obj: %.cpp
12
$(CONTRIB_OBJS_DIR)-saflp-%.obj: %.cpp
13 13
	..\..\admb -c $(OPTION) $<
14 14
	copy $(basename $<).obj $@
15 15

  
16
$(CONTRIB_OBJS_DIR)\optlp-contrib-%.obj: %.cpp
16
$(CONTRIB_OBJS_DIR)-optlp-%.obj: %.cpp
17 17
	..\..\admb -c -f $(OPTION) $<
18 18
	copy $(basename $<).obj $@
19 19
else
20
all: $(addprefix $(CONTRIB_OBJS_DIR)/saflp-contrib-, $(OBJECTS)) $(addprefix $(CONTRIB_OBJS_DIR)/optlp-contrib-, $(OBJECTS))
20
all: $(addprefix $(CONTRIB_OBJS_DIR)-saflp-, $(OBJECTS)) $(addprefix $(CONTRIB_OBJS_DIR)-optlp-, $(OBJECTS))
21 21

  
22
$(CONTRIB_OBJS_DIR)/saflp-contrib-%.obj: %.cpp
22
$(CONTRIB_OBJS_DIR)-saflp-%.obj: %.cpp
23 23
	../../admb$(EXT) -c $(OPTION) $<
24 24
	cp $(basename $<).obj $@
25 25

  
26
$(CONTRIB_OBJS_DIR)/optlp-contrib-%.obj: %.cpp
26
$(CONTRIB_OBJS_DIR)-optlp-%.obj: %.cpp
27 27
	../../admb$(EXT) -c -f $(OPTION) $<
28 28
	cp $(basename $<).obj $@
29 29
endif
trunk/src/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
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff