Changeset 1907
- Timestamp:
- 03/15/07 18:01:44 (2 years ago)
- Files:
-
- trunk/lib/compiler/gdc/Makefile.am (modified) (3 diffs)
- trunk/lib/compiler/gdc/Makefile.in (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/compiler/gdc/Makefile.am
r1866 r1907 99 99 util/utf.o 100 100 101 OBJ_EXT = \ 102 ../../../std/intrinsic.o 103 101 104 MAIN_OBJS=$(subst ti_,typeinfo/ti_,$(TI)) 102 105 … … 106 109 ZLIB_OBJS= 107 110 108 GC_OBJS= 111 GC_OBJS= 109 112 110 113 # Removed threadsem for Tango … … 171 174 172 175 # GCC_OBJS (gcc/config.o) first so I don't have to write more deps 173 ALL_PHOBOS_OBJS = $(OBJ_BASE) $(OBJ_UTIL) $( D_EXTRA_OBJS) $(GCC_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS) $(GC_OBJS) $(WEAK_OBJS)176 ALL_PHOBOS_OBJS = $(OBJ_BASE) $(OBJ_UTIL) $(OBJ_EXT) $(D_EXTRA_OBJS) $(GCC_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS) $(GC_OBJS) $(WEAK_OBJS) 174 177 175 178 libgphobos.a : $(ALL_PHOBOS_OBJS) $(CMAIN_OBJS) trunk/lib/compiler/gdc/Makefile.in
r1866 r1907 271 271 util/utf.o 272 272 273 OBJ_EXT = \ 274 ../../../std/intrinsic.o 275 273 276 MAIN_OBJS = $(subst ti_,typeinfo/ti_,$(TI)) 274 277 275 278 # This should not be linked into a shared library. 276 CMAIN_OBJS = 277 ZLIB_OBJS = 278 GC_OBJS = 279 CMAIN_OBJS = 280 ZLIB_OBJS = 281 GC_OBJS = 279 282 280 283 # Removed threadsem for Tango … … 282 285 283 286 # std.c.linux.linux, std.loader, gcc.cbridge* 284 WINDOWS_OBJS = 287 WINDOWS_OBJS = 285 288 CONFIG_D_FRAGMENTS = config/config-head frag-ac frag-gen frag-math config/config-mid config/config-tail 286 289 CONFIG_UNIX_FRAGMENTS = config/unix-head frag-unix config/unix-mid 287 290 288 291 # GCC_OBJS (gcc/config.o) first so I don't have to write more deps 289 ALL_PHOBOS_OBJS = $(OBJ_BASE) $(OBJ_UTIL) $( D_EXTRA_OBJS) $(GCC_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS) $(GC_OBJS) $(WEAK_OBJS)292 ALL_PHOBOS_OBJS = $(OBJ_BASE) $(OBJ_UTIL) $(OBJ_EXT) $(D_EXTRA_OBJS) $(GCC_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS) $(GC_OBJS) $(WEAK_OBJS) 290 293 291 294 # Work around what appears to be a GNU make bug handling MAKEFLAGS … … 381 384 @rm -f stamp-h1 382 385 cd $(top_builddir) && $(SHELL) ./config.status config.h 383 $(srcdir)/config.h.in: $(am__configure_deps) 386 $(srcdir)/config.h.in: $(am__configure_deps) 384 387 cd $(top_srcdir) && $(AUTOHEADER) 385 388 rm -f stamp-h1 … … 395 398 clean-noinstPROGRAMS: 396 399 -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) 397 minimal$(EXEEXT): $(minimal_OBJECTS) $(minimal_DEPENDENCIES) 400 minimal$(EXEEXT): $(minimal_OBJECTS) $(minimal_DEPENDENCIES) 398 401 @rm -f minimal$(EXEEXT) 399 402 $(LINK) $(minimal_LDFLAGS) $(minimal_OBJECTS) $(minimal_LDADD) $(LIBS)
