Moving sources into src/ directory.

2009-05-04 13:02:29 +00:00
parent 0b979eaee2
commit f5acfd7af3
20 changed files with 30 additions and 27 deletions
@@ -1,31 +1,5 @@
-bin_PROGRAMS = anticol list mftool relay emulate
-
-# set the include path found by configure
-INCLUDES= $(all_includes)
-
-nfcinclude_HEADERS = libnfc.h bitutils.h defines.h dev_acr122.h dev_pn531.h types.h mifaretag.h devices.h
-nfcincludedir = $(includedir)/libnfc
-
-lib_LTLIBRARIES = libnfc.la
-
-libnfc_la_CFLAGS = @LIBUSB_CFLAGS@ @LIBPCSCLITE_CFLAGS@
-libnfc_la_SOURCES = dev_pn531.c dev_acr122.c bitutils.c libnfc.c
-libnfc_la_LIBADD = @LIBUSB_LIBS@ @LIBPCSCLITE_LIBS@
+SUBDIRS = src

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnfc.pc

-anticol_SOURCES = anticol.c
-anticol_LDADD = libnfc.la
-
-list_SOURCES = list.c
-list_LDADD = libnfc.la
-
-mftool_SOURCES = mftool.c
-mftool_LDADD = libnfc.la
-
-relay_SOURCES = relay.c
-relay_LDADD = libnfc.la
-
-emulate_SOURCES = emulate.c
-emulate_LDADD = libnfc.la
@@ -34,6 +34,7 @@ AC_SUBST(LIBPCSCLITE_CFLAGS)

 AC_CONFIG_FILES([
 		Makefile
+		src/Makefile
 		libnfc.pc
 		])

@@ -0,0 +1,28 @@
+bin_PROGRAMS = anticol list mftool relay emulate
+
+# set the include path found by configure
+INCLUDES= $(all_includes)
+
+nfcinclude_HEADERS = libnfc.h bitutils.h defines.h dev_acr122.h dev_pn531.h types.h mifaretag.h devices.h
+nfcincludedir = $(includedir)/libnfc
+
+lib_LTLIBRARIES = libnfc.la
+
+libnfc_la_CFLAGS = @LIBUSB_CFLAGS@ @LIBPCSCLITE_CFLAGS@
+libnfc_la_SOURCES = dev_pn531.c dev_acr122.c bitutils.c libnfc.c
+libnfc_la_LIBADD = @LIBUSB_LIBS@ @LIBPCSCLITE_LIBS@
+
+anticol_SOURCES = anticol.c
+anticol_LDADD = libnfc.la
+
+list_SOURCES = list.c
+list_LDADD = libnfc.la
+
+mftool_SOURCES = mftool.c
+mftool_LDADD = libnfc.la
+
+relay_SOURCES = relay.c
+relay_LDADD = libnfc.la
+
+emulate_SOURCES = emulate.c
+emulate_LDADD = libnfc.la