Serj Kalichev преди 3 години
родител
ревизия
be3b5e64e5
променени са 11 файла, в които са добавени 23 реда и са изтрити 25 реда
  1. 2 2
      Makefile.am
  2. 0 17
      db/Makefile.am
  3. 17 0
      dbs/Makefile.am
  4. 1 1
      dbs/expat/Makefile.am
  5. 0 0
      dbs/expat/expat_api.c
  6. 2 2
      dbs/libxml2/Makefile.am
  7. 0 0
      dbs/libxml2/libxml2_api.c
  8. 0 0
      dbs/libxml2/libxml2_plugin.c
  9. 1 1
      dbs/roxml/Makefile.am
  10. 0 0
      dbs/roxml/roxml_api.c
  11. 0 2
      klish/Makefile.am

+ 2 - 2
Makefile.am

@@ -24,11 +24,11 @@ noinst_HEADERS =
 
 EXTRA_DIST =
 	klish/Makefile.am \
-	db/Makefile.am \
+	dbs/Makefile.am \
 	bin/Makefile.am
 
 include $(top_srcdir)/klish/Makefile.am
-include $(top_srcdir)/db/Makefile.am
+include $(top_srcdir)/dbs/Makefile.am
 include $(top_srcdir)/bin/Makefile.am
 
 define CONTROL

+ 0 - 17
db/Makefile.am

@@ -1,17 +0,0 @@
-dbdir = ${pkglibdir}/db
-db_LTLIBRARIES =
-
-EXTRA_DIST += \
-	db/libxml2/Makefile.am \
-	db/roxml/Makefile.am \
-	db/expat/Makefile.am
-
-if WITH_LIBXML2
-include $(top_srcdir)/db/libxml2/Makefile.am
-endif
-if WITH_ROXML
-include $(top_srcdir)/db/roxml/Makefile.am
-endif
-if WITH_EXPAT
-include $(top_srcdir)/db/expat/Makefile.am
-endif

+ 17 - 0
dbs/Makefile.am

@@ -0,0 +1,17 @@
+dbdir = ${pkglibdir}/db
+db_LTLIBRARIES =
+
+EXTRA_DIST += \
+	dbs/libxml2/Makefile.am \
+	dbs/roxml/Makefile.am \
+	dbs/expat/Makefile.am
+
+if WITH_LIBXML2
+include $(top_srcdir)/dbs/libxml2/Makefile.am
+endif
+if WITH_ROXML
+include $(top_srcdir)/dbs/roxml/Makefile.am
+endif
+if WITH_EXPAT
+include $(top_srcdir)/dbs/expat/Makefile.am
+endif

+ 1 - 1
db/expat/Makefile.am → dbs/expat/Makefile.am

@@ -6,4 +6,4 @@ kdb_expat_la_CFLAGS = $(AM_LDFLAGS) $(EXPAT_CFLAGS)
 kdb_expat_la_LIBADD = libklish-helper-xml.la
 
 kdb_expat_la_SOURCES += \
-	db/expat/expat_api.c
+	dbs/expat/expat_api.c

+ 0 - 0
db/expat/expat_api.c → dbs/expat/expat_api.c


+ 2 - 2
db/libxml2/Makefile.am → dbs/libxml2/Makefile.am

@@ -6,5 +6,5 @@ kdb_libxml2_la_CFLAGS = $(AM_LDFLAGS) $(LIBXML2_CFLAGS)
 kdb_libxml2_la_LIBADD = libklish-helper-xml.la
 
 kdb_libxml2_la_SOURCES += \
-	db/libxml2/libxml2_api.c \
-	db/libxml2/libxml2_plugin.c
+	dbs/libxml2/libxml2_api.c \
+	dbs/libxml2/libxml2_plugin.c

+ 0 - 0
db/libxml2/libxml2_api.c → dbs/libxml2/libxml2_api.c


+ 0 - 0
db/libxml2/libxml2_plugin.c → dbs/libxml2/libxml2_plugin.c


+ 1 - 1
db/roxml/Makefile.am → dbs/roxml/Makefile.am

@@ -6,4 +6,4 @@ kdb_roxml_la_CFLAGS = $(AM_LDFLAGS) $(ROXML_CFLAGS)
 kdb_roxml_la_LIBADD = libklish-helper-xml.la
 
 kdb_roxml_la_SOURCES += \
-	db/roxml/roxml_api.c
+	dbs/roxml/roxml_api.c

+ 0 - 0
db/roxml/roxml_api.c → dbs/roxml/roxml_api.c


+ 0 - 2
klish/Makefile.am

@@ -43,14 +43,12 @@ EXTRA_DIST += \
 	klish/kscheme/Makefile.am \
 	klish/ischeme/Makefile.am \
 	klish/ksession/Makefile.am \
-	klish/kdb/Makefile.am \
 	klish/xml-helper/Makefile.am
 
 include $(top_srcdir)/klish/ktp/Makefile.am
 include $(top_srcdir)/klish/kscheme/Makefile.am
 include $(top_srcdir)/klish/ischeme/Makefile.am
 include $(top_srcdir)/klish/ksession/Makefile.am
-include $(top_srcdir)/klish/kdb/Makefile.am
 include $(top_srcdir)/klish/xml-helper/Makefile.am
 
 #if TESTC