Use Makefile if statements rather than their shell counterparts.

libpthread/Makefile

@@ -65,20 +65,18 @@ ALL_SUBDIRS = linuxthreads linuxthreads_db
 all: $(LIBPTHREAD) $(LIBTHREAD_DB)
 
 $(LIBPTHREAD): subdirs
-	@if [ -f $(LIBPTHREAD) ] ; then \
+ifeq ($(strip $(UCLIBC_HAS_THREADS)),y)
-		set -e; \
+	$(INSTALL) -d $(TOPDIR)lib
-		$(INSTALL) -d $(TOPDIR)lib; \
+	$(RM) $(TOPDIR)lib/$(LIBPTHREAD)
-		$(RM) $(TOPDIR)lib/$(LIBPTHREAD); \
+	$(INSTALL) -m 644 $(LIBPTHREAD) $(TOPDIR)lib
-		$(INSTALL) -m 644 $(LIBPTHREAD) $(TOPDIR)lib; \
+endif
-	fi;
 
 $(LIBTHREAD_DB): subdirs
-	@if [ -f $(LIBTHREAD_DB) ] ; then \
+ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-		set -e; \
+	$(INSTALL) -d $(TOPDIR)lib
-		$(INSTALL) -d $(TOPDIR)lib; \
+	$(RM) $(TOPDIR)lib/$(LIBTHREAD_DB)
-		$(RM) $(TOPDIR)lib/$(LIBTHREAD_DB); \
+	$(INSTALL) -m 644 $(LIBTHREAD_DB) $(TOPDIR)lib
-		$(INSTALL) -m 644 $(LIBTHREAD_DB) $(TOPDIR)lib; \
+endif
-	fi;
 
 
 $(OBJS): %.o : %.c
@@ -88,38 +86,35 @@ $(OBJS): %.o : %.c
 $(OBJ): Makefile
 
 shared: all
-	if [ -f $(LIBPTHREAD) ] ; then \
+ifeq ($(strip $(UCLIBC_HAS_THREADS)),y)
-		set -e; \
+	$(LD) $(LDFLAGS_THREAD) -soname=$(LIBPTHREAD_SHARED).$(MAJOR_VERSION) \
-		$(LD) $(LDFLAGS_THREAD) -soname=$(LIBPTHREAD_SHARED).$(MAJOR_VERSION) \
+		-o $(LIBPTHREAD_SHARED_FULLNAME) $(SHARED_START_FILES) --whole-archive $(LIBPTHREAD) \
-			-o $(LIBPTHREAD_SHARED_FULLNAME) $(SHARED_START_FILES) --whole-archive $(LIBPTHREAD) \
+		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-			--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) \
-			-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) \
+		$(SHARED_END_FILES)
-			$(SHARED_END_FILES); \
+	$(INSTALL) -d $(TOPDIR)lib
-		$(INSTALL) -d $(TOPDIR)lib; \
+	$(RM) $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \
-		$(RM) $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \
+		$(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION)
-			$(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \
+	$(INSTALL) -m 644 $(LIBPTHREAD_SHARED_FULLNAME) $(TOPDIR)lib
-		$(INSTALL) -m 644 $(LIBPTHREAD_SHARED_FULLNAME) $(TOPDIR)lib; \
+	$(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
-		$(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
+		$(TOPDIR)lib/$(LIBPTHREAD_SHARED)
-			$(TOPDIR)lib/$(LIBPTHREAD_SHARED); \
+	$(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
-		$(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
+		$(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION)
-			$(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \
+endif
-	fi;
+ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-	if [ -f $(LIBTHREAD_DB) ] ; then \
+	$(LD) $(LDFLAGS_THREAD_DB) -soname=$(LIBTHREAD_DB_SHARED).1 \
-		set -e; \
+		-o $(LIBTHREAD_DB_SHARED_FULLNAME) --whole-archive $(LIBTHREAD_DB) \
-		$(LD) $(LDFLAGS_THREAD_DB) -soname=$(LIBTHREAD_DB_SHARED).1 \
+		--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-			-o $(LIBTHREAD_DB_SHARED_FULLNAME) --whole-archive $(LIBTHREAD_DB) \
+		-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-			--no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+	$(INSTALL) -d $(TOPDIR)lib
-			-L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) \
+	$(RM) $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \
-			; \
+		$(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).1
-		$(INSTALL) -d $(TOPDIR)lib; \
+	$(INSTALL) -m 644 $(LIBTHREAD_DB_SHARED_FULLNAME) $(TOPDIR)lib
-		$(RM) $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \
+	$(LN) -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
-			$(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).1; \
+		$(TOPDIR)lib/$(LIBTHREAD_DB_SHARED)
-		$(INSTALL) -m 644 $(LIBTHREAD_DB_SHARED_FULLNAME) $(TOPDIR)lib; \
+	$(LN) -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
-		$(LN) -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
+		$(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).1
-			$(TOPDIR)lib/$(LIBTHREAD_DB_SHARED); \
+endif
-		$(LN) -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
-			$(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).1; \
-	fi;
 
 tags:
 	ctags -R