Changeset 129 for trunk/src/Makefile.in

Timestamp:

11/18/09 04:40:30 (3 years ago)

Author:

mercyful

Message:

$ Build 438/Sql Alpha
+ Removed all SQLite Code and References.
+ Updated the SQL Wrapper, and all Automake files to now link in and also Detect MySql? in the configure scripts.
+ Added detection for OpenSSL, not in use yet, but will add encryption for passwords.

and anything else of intertest once everything is moved over to the SQL Backend.

This is still an interm develop update release, the MySql? backend
is still a WIP, and the Husky SMAPI Library will be removed shortly.

Files:

• trunk/src/Makefile.in (modified) (7 diffs)

trunk/src/Makefile.in

@@ -57 +57 @@
         file_list.$(OBJEXT) files.$(OBJEXT) history.$(OBJEXT) \
         language.$(OBJEXT) logon.$(OBJEXT) main_system.$(OBJEXT) \
-        menu_func.$(OBJEXT) msg_api.$(OBJEXT) sql_Database.$(OBJEXT) \
-        sql_Query.$(OBJEXT) sql_StderrLog.$(OBJEXT) \
-        sql_SysLog.$(OBJEXT) msg_area.$(OBJEXT) msg_edit.$(OBJEXT) \
-        msg_email.$(OBJEXT) msg_fse.$(OBJEXT) msg_new.$(OBJEXT) \
-        msg_newscan.$(OBJEXT) msg_pack.$(OBJEXT) msg_quote.$(OBJEXT) \
-        msg_read.$(OBJEXT) msg_readll.$(OBJEXT) msg_stats.$(OBJEXT) \
-        msg_title.$(OBJEXT) msgs.$(OBJEXT) node.$(OBJEXT) \
-        plenthral.$(OBJEXT) pyenthral.$(OBJEXT) user_list.$(OBJEXT) \
+        menu_func.$(OBJEXT) msg_api.$(OBJEXT) msg_area.$(OBJEXT) \
+        msg_edit.$(OBJEXT) msg_email.$(OBJEXT) msg_fse.$(OBJEXT) \
+        msg_new.$(OBJEXT) msg_newscan.$(OBJEXT) msg_pack.$(OBJEXT) \
+        msg_quote.$(OBJEXT) msg_read.$(OBJEXT) msg_readll.$(OBJEXT) \
+        msg_stats.$(OBJEXT) msg_title.$(OBJEXT) msgs.$(OBJEXT) \
+        node.$(OBJEXT) plenthral.$(OBJEXT) pyenthral.$(OBJEXT) \
+        sql_Database.$(OBJEXT) sql_Query.$(OBJEXT) \
+        sql_StderrLog.$(OBJEXT) sql_SysLog.$(OBJEXT) \
+        sql_enum_t.$(OBJEXT) sql_set_t.$(OBJEXT) user_list.$(OBJEXT) \
         users.$(OBJEXT)
 enthral_OBJECTS = $(am_enthral_OBJECTS)
 am__DEPENDENCIES_1 =
-enthral_DEPENDENCIES = libsmapilnx.a $(am__DEPENDENCIES_1)
+enthral_DEPENDENCIES = $(am__DEPENDENCIES_1) libsmapilnx.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -120 +121 @@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_MYSQL_FALSE = @HAVE_MYSQL_FALSE@
+HAVE_MYSQL_TRUE = @HAVE_MYSQL_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -133 +136 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -195 +200 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mysql_config = @mysql_config@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
@@ -209 +215 @@
 enthral_SOURCES = configbbs.cpp conio.cpp console.cpp data_areas.cpp dtfunc.cpp \
         enthral.cpp file_area.cpp file_edit.cpp file_list.cpp files.cpp history.cpp \
-        language.cpp logon.cpp main_system.cpp menu_func.cpp msg_api.cpp \
-        sql_Database.cpp sql_Query.cpp sql_StderrLog.cpp sql_SysLog.cpp msg_area.cpp \
+        language.cpp logon.cpp main_system.cpp menu_func.cpp msg_api.cpp msg_area.cpp \
         msg_edit.cpp msg_email.cpp msg_fse.cpp msg_new.cpp msg_newscan.cpp msg_pack.cpp \
         msg_quote.cpp msg_read.cpp msg_readll.cpp msg_stats.cpp msg_title.cpp msgs.cpp \
-        node.cpp plenthral.cpp pyenthral.cpp user_list.cpp users.cpp
+        node.cpp plenthral.cpp pyenthral.cpp sql_Database.cpp sql_Query.cpp \
+        sql_StderrLog.cpp sql_SysLog.cpp sql_enum_t.cpp sql_set_t.cpp user_list.cpp users.cpp
 
 
@@ -221 +227 @@
 # the library search path.
 enthral_LDFLAGS = $(all_libraries)
-enthral_LDADD = -lpthread -lsqlite3 libsmapilnx.a $(PY_LIBS)
+enthral_LDADD = $(PY_LIBS) -lpthread -lmysqlclient libsmapilnx.a
 noinst_HEADERS = api_brow.h compiler.h configbbs.h conio.h console.h \
         data_areas.h dtfunc.h file_area.h file_edit.h file_list.h files.h history.h \
-        language.h logon.h main_system.h menu_func.h msg_api.h \
-        sql_Database.h sql_Query.h sql_StderrLog.h sql_SysLog.h sql_IError.h msg_email.h msg_fse.h \
-        msg_email.h msg_fse.h \
+        language.h logon.h main_system.h menu_func.h msg_api.h msg_email.h msg_fse.h \
         msg_new.h msg_pack.h msg_read.h msg_readll.h msg_stats.h msg_title.h msgapi.h \
-        msgs.h node.h stamp.h struct.h typedefs.h user_list.h users.h
+        msgs.h node.h sql_Database.h sql_IError.h sql_Query.h sql_StderrLog.h \
+        sql_SysLog.h sql_enum_t.h sql_set_t.h stamp.h struct.h typedefs.h user_list.h \
+        users.h
 
 _SOURCES = pyenthral.h plenthral.h
@@ -338 +344 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_StderrLog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_SysLog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_enum_t.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_set_t.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@