reorganize

Makefile

@@ -10,7 +10,10 @@
 CFLAGS=-pthread -O3 $(DEBUGFLAGS)
 RTFLAGS=-lrt
 
-SOURCES=alarm.c	alarm_cond.c	alarm_fork.c	alarm_mutex.c	\
+BIN=./bin
+SOURCE=./src
+
+SOURCES_C=alarm.c	alarm_cond.c	alarm_fork.c	alarm_mutex.c	\
 	alarm_thread.c	atfork.c	backoff.c	\
 	barrier_main.c	cancel.c	cancel_async.c	cancel_cleanup\
 	cancel_disable.c cancel_subcontract.c	cond.c	cond_attr.c	\
@@ -23,32 +26,60 @@ SOURCES=alarm.c	alarm_cond.c	alarm_fork.c	alarm_mutex.c	\
 	sigwait.c	susp.c	thread.c \
 	thread_attr.c	thread_error.c	trylock.c	tsd_destructor.c \
 	tsd_once.c	workq_main.c
-PROGRAMS=$(SOURCES:.c=)
+
-all:	${PROGRAMS}
+NAMES_C=$(SOURCES_C:.c=)
-alarm_mutex:
+PROGRAMS_C=$(addprefix $(BIN)/c_, $(NAMES_C))
-	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ alarm_mutex.c
+
-backoff:
+SOURCES_CXX=alarm_mutex.cpp	pipe.cpp	
-	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ backoff.c
+
-sched_attr:
+NAMES_CXX=$(SOURCES_CXX:.cpp=)
-	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ sched_attr.c
+PROGRAMS_CXX=$(addprefix $(BIN)/cpp_, $(NAMES_CXX))
-sched_thread:
+
-	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ sched_thread.c
+all:	${PROGRAMS_C}	${PROGRAMS_CXX}
-semaphore_signal:
+
-	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ semaphore_signal.c
+$(BIN)/c_%:	$(SOURCE)/%.c
-semaphore_wait:
+	$(CC) $(INC) $< $(CFLAGS) -o $@ $(LIBS)
-	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ semaphore_wait.c
+
-sigev_thread:
+$(BIN)/c_alarm_mutex:	$(SOURCE)/alarm_mutex.c
-	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ sigev_thread.c
+	$(CC) $(INC) $< $(CFLAGS) ${RTFLAGS} -o $@ $(LIBS)
-susp:
+
-	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ susp.c
+$(BIN)/c_backoff:	$(SOURCE)/backoff.c
-rwlock_main: rwlock.c rwlock.h rwlock_main.c
+	$(CC) $(INC) $< $(CFLAGS) ${RTFLAGS} -o $@ $(LIBS)
-	${CC} ${CFLAGS} ${LDFLAGS} -o $@ rwlock_main.c rwlock.c
+ 
-rwlock_try_main: rwlock.h rwlock.c rwlock_try_main.c
+$(BIN)/c_sched_attr:	$(SOURCE)/sched_attr.c
-	${CC} ${CFLAGS} ${LDFLAGS} -o $@ rwlock_try_main.c rwlock.c
+	$(CC) $(INC) $< $(CFLAGS) ${RTFLAGS} -o $@ $(LIBS)
-barrier_main: barrier.h barrier.c barrier_main.c
+ 
-	${CC} ${CFLAGS} ${LDFLAGS} -o $@ barrier_main.c barrier.c
+$(BIN)/c_sched_thread:	$(SOURCE)/sched_thread.c
-workq_main: workq.h workq.c workq_main.c
+	$(CC) $(INC) $< $(CFLAGS) ${RTFLAGS} -o $@ $(LIBS) 
-	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ workq_main.c workq.c
+
+$(BIN)/c_semaphore_signal:	$(SOURCE)/semaphore_signal.c
+	$(CC) $(INC) $< $(CFLAGS) ${RTFLAGS} -o $@ $(LIBS) 
+
+$(BIN)/c_semaphore_wait:	$(SOURCE)/semaphore_wait.c
+	$(CC) $(INC) $< $(CFLAGS) ${RTFLAGS} -o $@ $(LIBS) 
+
+$(BIN)/c_sigev_thread:	$(SOURCE)/sigev_thread.c
+	$(CC) $(INC) $< $(CFLAGS) ${RTFLAGS} -o $@ $(LIBS) 
+
+$(BIN)/c_susp:
+	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ $(SOURCE)/susp.c
+
+$(BIN)/c_rwlock_main: $(SOURCE)/rwlock.c $(SOURCE)/rwlock.h $(SOURCE)/rwlock_main.c
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $(SOURCE)/rwlock_main.c $(SOURCE)/rwlock.c
+
+$(BIN)/c_rwlock_try_main: $(SOURCE)/rwlock.h $(SOURCE)/rwlock.c $(SOURCE)/rwlock_try_main.c
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $(SOURCE)/rwlock_try_main.c $(SOURCE)/rwlock.c
+
+$(BIN)/c_barrier_main: $(SOURCE)/barrier.h $(SOURCE)/barrier.c $(SOURCE)/barrier_main.c
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $(SOURCE)/barrier_main.c $(SOURCE)/barrier.c
+
+$(BIN)/c_workq_main: $(SOURCE)/workq.h $(SOURCE)/workq.c $(SOURCE)/workq_main.c
+	${CC} ${CFLAGS} ${RTFLAGS} ${LDFLAGS} -o $@ $(SOURCE)/workq_main.c $(SOURCE)/workq.c
+
+$(BIN)/cpp_%:	$(SOURCE)/%.cpp
+	$(CXX) $(INC) $< $(CFLAGS) -o $@ $(LIBS)
+
 clean:
-	@rm -rf $(PROGRAMS) *.o
+	@rm -rf $(PROGRAMS_C) ${PROGRAMS_CXX} *.o
+
 recompile:	clean all

bin/.gitignore

@@ -0,0 +1 @@
+*