浏览代码

Refactoring: moving all header files into include/ subdirs.

Creating include/ in src/, and then a root of directories such that
everything belonging to qa now stays inside the qa/directory. Eventually,
questions files can be found in qa/questions
XXX. shall questions.h be found in qa/ or qa/questions? :S
Michele Orrù 11 年之前
父节点
当前提交
1b575acff5

+ 1 - 1
src/Makefile.am

@@ -3,7 +3,7 @@ SUBDIRS = questions/ apps/
 CC = clang
 
 AM_LDFLAGS = -lcrypto -lm -lssl
-AM_CFLAGS = --std=c99 -ggdb -I include/ -I questions/
+AM_CFLAGS = --std=c99 -ggdb -I include/
 
 bin_PROGRAMS = qa
 qa_SOURCES = qa.c qa_sock.c cmdline.c

+ 1 - 1
src/cmdline.c

@@ -14,7 +14,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "qa.h"
+#include "qa/qa.h"
 
 /**
  * \brief Prints the usage message, then exit.

src/include/qa.h → src/include/qa/qa.h


src/include/qa_sock.h → src/include/qa/qa_sock.h


+ 1 - 0
src/include/qa/questions

@@ -0,0 +1 @@
+../../questions/include

+ 3 - 3
src/qa.c

@@ -10,9 +10,9 @@
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 
-#include "qa.h"
-#include "questions.h"
-#include "qa_sock.h"
+#include "qa/qa.h"
+#include "qa/questions/questions.h"
+#include "qa/qa_sock.h"
 
 /** BIO wrapper around stdout */
 BIO* bio_out;

+ 1 - 1
src/qa_sock.c

@@ -13,7 +13,7 @@
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 
-#include "qa.h"
+#include "qa/qa.h"
 
 #define SOCKET_PROTOCOL 0
 #define INVALID_SOCKET  (-1)

+ 2 - 1
src/questions/Makefile.am

@@ -1,4 +1,5 @@
-
 lib_LIBRARIES = libquestions.a
+AM_CFLAGS = -I ../include/
 libquestions_a_SOURCES = wiener.c pollard.c example.c allquestions.c
+
 # da fuck liquestions_a_HEADERS = qwiener.h questions.h

+ 1 - 1
src/questions/allquestions.c

@@ -1,6 +1,6 @@
 #include <sys/queue.h>
 
-#include "questions.h"
+#include "qa/questions/questions.h"
 
 
 #define REGISTER_QUESTION(q)                      \

+ 3 - 3
src/questions/dixon.c

@@ -22,9 +22,9 @@
 
 #include <openssl/bn.h>
 
-#include "qarith.h"
-#include "qstrings.h"
-#include "questions.h"
+#include "qa/questions/qarith.h"
+#include "qa/questions/qstrings.h"
+#include "qa/questions/questions.h"
 
 #define EPOCHS             100
 #define REPOP_EPOCHS        50

+ 1 - 1
src/questions/example.c

@@ -2,7 +2,7 @@
 #include <openssl/x509.h>
 
 
-#include "questions.h"
+#include "qa/questions/questions.h"
 
 static BIO* out;
 

src/questions/qarith.h → src/questions/include/qarith.h


src/questions/qpollard.h → src/questions/include/qpollard.h


src/questions/qstrings.h → src/questions/include/qstrings.h


src/questions/questions.h → src/questions/include/questions.h


src/questions/qwiener.h → src/questions/include/qwiener.h


+ 3 - 1
src/questions/pollard.c

@@ -25,7 +25,9 @@
 #include <openssl/x509.h>
 #include <openssl/err.h>
 
-#include "questions.h"
+#include "qa/questions/questions.h"
+#include "qa/questions/qpollard.h"
+
 
 static BIGNUM *two;
 

+ 2 - 2
src/questions/wiener.c

@@ -9,8 +9,8 @@
 #include <openssl/rsa.h>
 #include <openssl/bn.h>
 
-#include "questions.h"
-#include "qwiener.h"
+#include "qa/questions/questions.h"
+#include "qa/questions/qwiener.h"
 
 
 cf_t* cf_new(void)