diff options
Diffstat (limited to 'newlib/libc/sys/linux/linuxthreads/Makefile.am')
| -rw-r--r-- | newlib/libc/sys/linux/linuxthreads/Makefile.am | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/newlib/libc/sys/linux/linuxthreads/Makefile.am b/newlib/libc/sys/linux/linuxthreads/Makefile.am index 6b5ee7115..29c8650fa 100644 --- a/newlib/libc/sys/linux/linuxthreads/Makefile.am +++ b/newlib/libc/sys/linux/linuxthreads/Makefile.am @@ -32,19 +32,20 @@ LIB_DB_SOURCES = td_init.c td_log.c td_ta_delete.c td_ta_get_nthreads.c \ td_ta_clear_event.c td_symbol_list.c # Because of how libtool moves objects around, these files must be built last. -LIBADD_OBJS = mutex.$(oext) specific.$(oext) pthread.$(oext) \ - cancel.$(oext) +LIBADD_OBJS = \ + $(lpfx)mutex.$(oext) $(lpfx)specific.$(oext) \ + $(lpfx)pthread.$(oext) $(lpfx)cancel.$(oext) -ELIX_3_OBJS = \ - ptfork.$(oext) +ELIX_3_SOURCES = \ + ptfork.c if ELIX_LEVEL_1 -EXTRA_OBJS = reqsyscalls.$(oext) +ELIX_SOURCES = reqsyscalls.c else if ELIX_LEVEL_2 -EXTRA_OBJS = reqsyscalls.$(oext) +ELIX_SOURCES = reqsyscalls.c else -EXTRA_OBJS = $(ELIX_3_OBJS) +ELIX_SOURCES = $(ELIX_3_SOURCES) endif endif @@ -63,10 +64,10 @@ extra-libtool-objlist: $(MACHINE_OBJLIST) cat $(MACHINE_OBJLIST) | $(AWK) '{ libpthread[$$1] = $$2 }; END { for (x in libpthread) printf ("%s\n", libpthread[x]) }' > $@ toollib_LTLIBRARIES = libpthread.la libthread_db.la -libpthread_la_SOURCES = $(LIB_SOURCES) -libpthread_la_LIBADD = $(LIBADD_OBJS) $(EXTRA_OBJS) +libpthread_la_SOURCES = $(LIB_SOURCES) $(ELIX_SOURCES) +libpthread_la_LIBADD = $(LIBADD_OBJS) ## libpthread_la_DEPENDENCIES = defs.h crti.S -libpthread_la_DEPENDENCIES = $(LIBADD_OBJS) $(EXTRA_OBJS) extra-libtool-objlist +libpthread_la_DEPENDENCIES = $(LIBADD_OBJS) extra-libtool-objlist noinst_DATA=objectlist.awk.in LIB_COMPILE = $(LTCOMPILE) @@ -75,11 +76,11 @@ libthread_db_la_SOURCES = $(LIB_DB_SOURCES) else toollib_LIBRARIES = libpthread.a libthread_db.a -libpthread_a_SOURCES = $(LIB_SOURCES) -libpthread_a_LIBADD = $(LIBADD_OBJS) $(EXTRA_OBJS) $(MACHINE_LIB) +libpthread_a_SOURCES = $(LIB_SOURCES) $(ELIX_SOURCES) +libpthread_a_LIBADD = $(LIBADD_OBJS) $(MACHINE_LIB) libpthread_a_CFLAGS = $(AM_CFLAGS) ## libpthread_a_DEPENDENCIES = defs.h crti.S -libpthread_a_DEPENDENCIES = $(LIBADD_OBJS) $(EXTRA_OBJS) $(MACHINE_LIB) +libpthread_a_DEPENDENCIES = $(LIBADD_OBJS) $(MACHINE_LIB) LIB_COMPILE = $(COMPILE) libthread_db_a_SOURCES = $(LIB_DB_SOURCES) @@ -127,18 +128,18 @@ defs.h: pt-initfini.s crti.o: crti.S defs.h $(CC) -g0 $(ASFLAGS) -o $@ -mutex.$(oext): $(srcdir)/mutex.c +$(lpfx)mutex.$(oext): $(srcdir)/mutex.c $(LIB_COMPILE) $(CFLAGS_noweak) -c $< -o $@ -specific.$(oext): $(srcdir)/specific.c +$(lpfx)specific.$(oext): $(srcdir)/specific.c $(LIB_COMPILE) $(CFLAGS_noweak) -c $< -o $@ -pthread.$(oext): $(srcdir)/pthread.c +$(lpfx)pthread.$(oext): $(srcdir)/pthread.c $(LIB_COMPILE) $(CFLAGS_pthread) -c $< -o $@ -ptfork.$(oext): $(srcdir)/ptfork.c +$(lpfx)ptfork.$(oext): $(srcdir)/ptfork.c $(LIB_COMPILE) $(CFLAGS_noweak) -c $< -o $@ -cancel.$(oext): $(srcdir)/cancel.c +$(lpfx)cancel.$(oext): $(srcdir)/cancel.c $(LIB_COMPILE) $(CFLAGS_cancel) -c $< -o $@ |