Massive restructure and renaming

configure.ac

@@ -7,7 +7,7 @@
 
 AC_PREREQ([2.68])
 AC_INIT([getdns], [0.320], [melinda.shore@nomountain.net])
-AC_CONFIG_SRCDIR([src/common/getdns_general.c])
+AC_CONFIG_SRCDIR([src/getdns/getdns.h])
 AM_INIT_AUTOMAKE
 LT_INIT
 AC_CONFIG_MACRO_DIR([m4])
@@ -37,6 +37,6 @@ AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 
-AC_CONFIG_FILES([Makefile src/Makefile src/common/Makefile src/example/Makefile src/test/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile src/getdns/Makefile src/example/Makefile src/test/Makefile])
-AC_CONFIG_SUBDIRS([src/ src/common/ src/example/ src/test/])
+AC_CONFIG_SUBDIRS([src/ src/getdns/ src/example/ src/test/])
 AC_OUTPUT

src/Makefile.am

@@ -1 +1,6 @@
-SUBDIRS = common example test
+SUBDIRS = example test
+AM_CPPFLAGS = -Wall -Werror -g -fPIC -I$(srcdir)/ -I /usr/local/include -std=c99
+lib_LTLIBRARIES = libgetdns.la
+libgetdns_la_SOURCES = context.c convert.c \
+    dict.c general.c hostname.c list.c \
+    service.c sync.c validate_dnssec.c

src/common/Makefile.am

@@ -1,7 +0,0 @@
-AM_CPPFLAGS = -Wall -Werror -g -fPIC -I$(srcdir)/ -I /usr/local/include -std=c99
-lib_LTLIBRARIES = libgetdns.la
-libgetdns_la_SOURCES = getdns_context.c getdns_convert.c \
-    getdns_dict.c getdns_general.c getdns_hostname.c getdns_list.c \
-    getdns_service.c getdns_sync.c getdns_validate_dnssec.c \
-    getdns_core_only.h getdns_libevent.h getdns_context.h
-include_HEADERS = getdns_core_only.h

src/common/getdns_libevent.h

@@ -1,12 +0,0 @@
-
-#include <event.h>
-#include <getdns_core_only.h>
-
-/* For libevent, which we are using for these examples */
-getdns_return_t
-getdns_extension_set_libevent_base(
-  getdns_context_t       context,
-  struct event_base      *this_event_base
-);
-
-

src/context.c

@@ -29,7 +29,7 @@
  */
 
 #include <string.h>
-#include <getdns_context.h>
+#include "getdns_context.h"
 #include <ldns/ldns.h>
 
 /* stuff to make it compile pedantically */

src/context.h

@@ -5,7 +5,7 @@
 #ifndef _GETDNS_CONTEXT_H_
 #define _GETDNS_CONTEXT_H_
 
-#include <getdns_libevent.h>
+#include <getdns/getdns.h>
 
 /** function pointer typedefs */
 typedef void (*getdns_update_callback)(getdns_context_t context, uint16_t changed_item);

src/convert.c

@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_core_only.h>
+#include <getdns/getdns.h>
 #include <stdio.h>
 
 /* stuff to make it compile pedantically */

src/dict.c

@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <search.h>
 #include <string.h>
-#include <getdns_core_only.h>
+#include <getdns/getdns.h>
 
 /* TODO: change this to make the walk safe for reentrant/multi-thread calls */
 struct getdns_list *walkresultlist;

src/example/example_all_functions.c

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <getdns_core_only.h>
+#include <getdns/getdns.h>
 
 #define UNUSED_PARAM(x) ((void)(x))
 

src/example/example_simple_answers.c

@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
-#include <getdns_libevent.h>
+#include <getdns/getdns.h>
 
 #define UNUSED_PARAM(x) ((void)(x))
 

src/example/example_synchronous.c

@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
-#include <getdns_core_only.h>
+#include <getdns/getdns.h>
 
 int
 main()

src/example/example_tree.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
-#include <getdns_libevent.h>
+#include <getdns/getdns.h>
 
 #define UNUSED_PARAM(x) ((void)(x))
 

src/general.c

@@ -58,7 +58,7 @@
  * Version: 0.1b
  */
 
-#include <getdns_context.h>
+#include "getdns_context.h"
 #include <ldns/ldns.h>
 
 /* useful macros */

src/getdns/Makefile.am

@@ -0,0 +1 @@
+include_HEADERS = getdns.h

src/getdns/getdns.h

@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <netinet/in.h>
 #include <stdbool.h>
+#include <event.h>
 
 #define GETDNS_COMPILATION_COMMENT The API implementation should fill in something here, such as a compilation version string and date, and change it each time the API is compiled.
 
@@ -966,4 +967,12 @@ getdns_context_set_memory_reallocator(
   void                   (*value)(void*)
 );
 
+/* Extension - refactor to abstract async evt loop */
+/* For libevent, which we are using for these examples */
+getdns_return_t
+getdns_extension_set_libevent_base(
+  getdns_context_t       context,
+  struct event_base      *this_event_base
+);
+
 #endif /* GETDNS_H */

src/hostname.c

@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_core_only.h>
+#include <getdns/getdns.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))

src/list.c

@@ -29,7 +29,7 @@
  */
 
 #include <string.h>
-#include <getdns_core_only.h>
+#include <getdns/getdns.h>
 
 /*---------------------------------------- getdns_list_get_length */
 getdns_return_t

src/service.c

@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_core_only.h>
+#include <getdns/getdns.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))

src/sync.c

@@ -27,7 +27,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_core_only.h>
+#include <getdns/getdns.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))

src/test/tests_dict.c

@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "testmessages.h"
-#include "getdns_core_only.h"
+#include <getdns/getdns.h>
 
 #define TSTMSGBUF 80
 

src/test/tests_list.c

@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "testmessages.h"
-#include "getdns_core_only.h"
+#include <getdns/getdns.h>
 
 #define TSTMSGBUF 80
 

src/validate_dnssec.c

@@ -28,7 +28,7 @@
  * THE SOFTWARE.
  */
 
-#include <getdns_core_only.h>
+#include <getdns/getdns.h>
 
 /* stuff to make it compile pedantically */
 #define UNUSED_PARAM(x) ((void)(x))