Makefile FTW and symlinks FTL

diff --git a/BOINC software/BOINC client apps/distrrtgen/ChainWalkContext.cpp b/BOINC software/BOINC client apps/distrrtgen/ChainWalkContext.cpp
deleted file mode 120000 (symlink)
index 064fbf9..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/ChainWalkContext.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/ChainWalkContext.cpp
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/ChainWalkContext.h b/BOINC software/BOINC client apps/distrrtgen/ChainWalkContext.h
deleted file mode 120000 (symlink)
index 0354b19..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/ChainWalkContext.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/ChainWalkContext.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/HashAlgorithm.cpp b/BOINC software/BOINC client apps/distrrtgen/HashAlgorithm.cpp
deleted file mode 120000 (symlink)
index f4c0fb5..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/HashAlgorithm.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/HashAlgorithm.cpp
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/HashAlgorithm.h b/BOINC software/BOINC client apps/distrrtgen/HashAlgorithm.h
deleted file mode 120000 (symlink)
index e92bbda..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/HashAlgorithm.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/HashAlgorithm.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/HashRoutine.cpp b/BOINC software/BOINC client apps/distrrtgen/HashRoutine.cpp
deleted file mode 120000 (symlink)
index 27615c9..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/HashRoutine.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/HashRoutine.cpp
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/HashRoutine.h b/BOINC software/BOINC client apps/distrrtgen/HashRoutine.h
deleted file mode 120000 (symlink)
index 559c352..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/HashRoutine.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/HashRoutine.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/Makefile b/BOINC software/BOINC client apps/distrrtgen/Makefile
index 153f289d924b66be1935d92c60139204c72415ae..d33961fc715be421dd145305e73c644acb5c4396 100644 (file)
--- a/BOINC software/BOINC client apps/distrrtgen/Makefile
+++ b/BOINC software/BOINC client apps/distrrtgen/Makefile
@@ -28,20 +28,20 @@ BOINC_DIR = /usr/share/boinc-dev
 BOINC_API_DIR = $(BOINC_DIR)/api
 BOINC_LIB_DIR = $(BOINC_DIR)/lib
 COMMON_LIB_DIR = /usr/lib
+INCLUDES = -I../../../Common/rt\ api -I$(BOINC_DIR) -I$(BOINC_LIB_DIR) -I$(BOINC_API_DIR) 
+COMMON_API_PATH = ../../../Common/rt\ api
 
 OPTIMIZATION = -O3
 
 CXXFLAGS = -g \
     -static -static-libgcc \
-    -I$(BOINC_DIR) \
-    -I$(BOINC_LIB_DIR) \
-    -I$(BOINC_API_DIR) \
         -Wall \
         -c \
         -DBOINC \
+        $(INCLUDES) \
         $(OPTIMIZATION)
 
-LFLAGS = -static -static-libgcc -Wall $(OPTIMIZATION) -L$(BOINC_API_DIR) \
+LFLAGS = -static -static-libgcc -Wall $(INCLUDES) $(OPTIMIZATION) -L$(BOINC_API_DIR) \
        -L$(BOINC_LIB_DIR) -L /usr/X11R6/lib -L.
 
 LIBS = -lboinc_api -lboinc -lpthread -lssl libstdc++.a $(COMMON_LIB_DIR)/libssl.a $(COMMON_LIB_DIR)/libpthread.a
@@ -65,32 +65,32 @@ distclean:
 
 rebuild: clean all
 
-ChainWalkContext.o: ChainWalkContext.h ChainWalkContext.cpp HashRoutine.h Public.h
-       $(CXX) $(CXXFLAGS) ChainWalkContext.cpp
+ChainWalkContext.o: $(COMMON_API_PATH)/ChainWalkContext.h $(COMMON_API_PATH)/ChainWalkContext.cpp $(COMMON_API_PATH)/HashRoutine.h $(COMMON_API_PATH)/Public.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/ChainWalkContext.cpp
 
-des_enc.o: des_enc.c des_locl.h spr.h
-       $(CXX) $(CXXFLAGS) des_enc.c
+des_enc.o: $(COMMON_API_PATH)/des_enc.c $(COMMON_API_PATH)/des_locl.h $(COMMON_API_PATH)/spr.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/des_enc.c
 
-des_setkey.o: des_setkey.c des_locl.h podd.h sk.h
-       $(CXX) $(CXXFLAGS) des_setkey.c
+des_setkey.o: $(COMMON_API_PATH)/des_setkey.c $(COMMON_API_PATH)/des_locl.h $(COMMON_API_PATH)/podd.h $(COMMON_API_PATH)/sk.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/des_setkey.c
 
-distrrtgen.o: distrrtgen.cpp distrrtgen.h ChainWalkContext.h Public.h
+distrrtgen.o: distrrtgen.cpp distrrtgen.h $(COMMON_API_PATH)/ChainWalkContext.h $(COMMON_API_PATH)/Public.h
        $(CXX) $(CXXFLAGS) distrrtgen.cpp
 
-ecb_enc.o: ecb_enc.c des_locl.h spr.h
-       $(CXX) $(CXXFLAGS) ecb_enc.c
+ecb_enc.o: $(COMMON_API_PATH)/ecb_enc.c $(COMMON_API_PATH)/des_locl.h $(COMMON_API_PATH)/spr.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/ecb_enc.c
 
-HashAlgorithm.o: HashAlgorithm.h HashAlgorithm.cpp Public.h md4.h md5.h
-       $(CXX) $(CXXFLAGS) HashAlgorithm.cpp
+HashAlgorithm.o: $(COMMON_API_PATH)/HashAlgorithm.h $(COMMON_API_PATH)/HashAlgorithm.cpp $(COMMON_API_PATH)/Public.h $(COMMON_API_PATH)/md4.h $(COMMON_API_PATH)/md5.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/HashAlgorithm.cpp
 
-HashRoutine.o: HashRoutine.h HashRoutine.cpp global.h HashAlgorithm.h
-       $(CXX) $(CXXFLAGS) HashRoutine.cpp
+HashRoutine.o: $(COMMON_API_PATH)/HashRoutine.h $(COMMON_API_PATH)/HashRoutine.cpp $(COMMON_API_PATH)/global.h $(COMMON_API_PATH)/HashAlgorithm.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/HashRoutine.cpp
 
-md4.o: md4.h md4.cpp global.h
-       $(CXX) $(CXXFLAGS) md4.cpp
+md4.o: $(COMMON_API_PATH)/md4.h $(COMMON_API_PATH)/md4.cpp $(COMMON_API_PATH)/global.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/md4.cpp
 
-md5.o: md5.h md5.cpp global.h
-       $(CXX) $(CXXFLAGS) md5.cpp
+md5.o: $(COMMON_API_PATH)/md5.h $(COMMON_API_PATH)/md5.cpp $(COMMON_API_PATH)/global.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/md5.cpp
 
-Public.o: Public.h Public.cpp global.h
-       $(CXX) $(CXXFLAGS) Public.cpp
+Public.o: $(COMMON_API_PATH)/Public.h $(COMMON_API_PATH)/Public.cpp $(COMMON_API_PATH)/global.h
+       $(CXX) $(CXXFLAGS) $(COMMON_API_PATH)/Public.cpp

diff --git a/BOINC software/BOINC client apps/distrrtgen/Public.cpp b/BOINC software/BOINC client apps/distrrtgen/Public.cpp
deleted file mode 120000 (symlink)
index c5461fe..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/Public.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/Public.cpp
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/Public.h b/BOINC software/BOINC client apps/distrrtgen/Public.h
deleted file mode 120000 (symlink)
index 20d6e3d..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/Public.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/Public.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/des.h b/BOINC software/BOINC client apps/distrrtgen/des.h
deleted file mode 120000 (symlink)
index a4f1427..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/des.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/des.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/des_enc.c b/BOINC software/BOINC client apps/distrrtgen/des_enc.c
deleted file mode 120000 (symlink)
index fea90ea..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/des_enc.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/des_enc.c
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/des_locl.h b/BOINC software/BOINC client apps/distrrtgen/des_locl.h
deleted file mode 120000 (symlink)
index 6cd2649..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/des_locl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/des_locl.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/des_setkey.c b/BOINC software/BOINC client apps/distrrtgen/des_setkey.c
deleted file mode 120000 (symlink)
index c4ad7a9..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/des_setkey.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/des_setkey.c
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/ecb_enc.c b/BOINC software/BOINC client apps/distrrtgen/ecb_enc.c
deleted file mode 120000 (symlink)
index b710750..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/ecb_enc.c
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/ecb_enc.c
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/global.h b/BOINC software/BOINC client apps/distrrtgen/global.h
deleted file mode 120000 (symlink)
index a5e31dc..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/global.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/global.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/md4.cpp b/BOINC software/BOINC client apps/distrrtgen/md4.cpp
deleted file mode 120000 (symlink)
index 3fec1a7..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/md4.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/md4.cpp
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/md4.h b/BOINC software/BOINC client apps/distrrtgen/md4.h
deleted file mode 120000 (symlink)
index 176b68b..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/md4.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/md4.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/md5.cpp b/BOINC software/BOINC client apps/distrrtgen/md5.cpp
deleted file mode 120000 (symlink)
index 6d0108c..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/md5.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/md5.cpp
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/md5.h b/BOINC software/BOINC client apps/distrrtgen/md5.h
deleted file mode 120000 (symlink)
index fc508f3..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/md5.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/md5.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/podd.h b/BOINC software/BOINC client apps/distrrtgen/podd.h
deleted file mode 120000 (symlink)
index ba3ebfe..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/podd.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/podd.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/sk.h b/BOINC software/BOINC client apps/distrrtgen/sk.h
deleted file mode 120000 (symlink)
index 159cee2..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/sk.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/sk.h
\ No newline at end of file

diff --git a/BOINC software/BOINC client apps/distrrtgen/spr.h b/BOINC software/BOINC client apps/distrrtgen/spr.h
deleted file mode 120000 (symlink)
index 30dd973..0000000
--- a/BOINC software/BOINC client apps/distrrtgen/spr.h
+++ /dev/null
@@ -1 +0,0 @@
-../../../Common/rt api/spr.h
\ No newline at end of file