summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2017-03-21 12:06:18 -0500
committerJohn Klug <john.klug@multitech.com>2017-03-21 12:06:18 -0500
commit23d921b91e20645718866bf8b460c18105075b7f (patch)
tree212dd156214c616f18baace801cf3ed2e5905917
parenta41bc36a2d8ce17d46327da9b709ca9e9c4c3de4 (diff)
downloadmts-id-eeprom-23d921b91e20645718866bf8b460c18105075b7f.tar.gz
mts-id-eeprom-23d921b91e20645718866bf8b460c18105075b7f.tar.bz2
mts-id-eeprom-23d921b91e20645718866bf8b460c18105075b7f.zip
Put Makefile.am in correct directory.
-rw-r--r--Makefile.am11
-rw-r--r--configure.in1
-rw-r--r--src/Makefile.am6
3 files changed, 7 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index bfeafff..8f99788 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,3 @@
AUTOMAKE_OPTIONS = gnu
-AM_CFLAGS = -Wall
-
-bin_PROGRAMS = mts-id-eeprom hashpwd
-mts_id_eeprom_SOURCES = eeprom_main.c
-hashpwd_SOURCES = hashpwd.cpp
-noinst_HEADERS = eeprom.h
-hashpwd_LDADD = -lcrypto
-
-
-EXTRA_DIST =
+SUBDIRS = src
diff --git a/configure.in b/configure.in
index 24a4e35..a15580d 100644
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,7 @@ AM_INIT_AUTOMAKE([mts-id-eeprom], [0.2.11])
AM_CONFIG_HEADER([config.h])
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_MAKE_SET
diff --git a/src/Makefile.am b/src/Makefile.am
index 186b2a6..bfeafff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,12 @@
AUTOMAKE_OPTIONS = gnu
AM_CFLAGS = -Wall
-bin_PROGRAMS = mts-id-eeprom
+
+bin_PROGRAMS = mts-id-eeprom hashpwd
mts_id_eeprom_SOURCES = eeprom_main.c
+hashpwd_SOURCES = hashpwd.cpp
noinst_HEADERS = eeprom.h
+hashpwd_LDADD = -lcrypto
+
EXTRA_DIST =