diff --git a/Makefile.am b/Makefile.am index 9e58983..7023988 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,6 @@ # Generic definitions SUBDIRS = lib doc utils test-tool examples -CLEANFILES= ACLOCAL_AMFLAGS =-I m4 AUTOMAKE_OPTIONS = foreign subdir-objects AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \ @@ -14,20 +13,11 @@ EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \ aros/aros_compat.c aros/aros_compat.h aros/iscsi-ls.c \ aros/Makefile.AROS \ win32/vsbuild.bat win32/win32_compat.c win32/win32_compat.h \ - lib/libiscsi.def \ patches/mtx-iscsi.diff patches/README patches/sg3_utils-1.32.patch -# Simplify conditions below by declaring variables as empty - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libiscsi.pc -bin_PROGRAMS = -noinst_PROGRAMS = -EXTRA_PROGRAMS = - -# libiscsi shared library - iscsi_includedir = $(includedir)/iscsi dist_iscsi_include_HEADERS = include/iscsi.h include/scsi-lowlevel.h dist_noinst_HEADERS = include/iscsi-private.h include/md5.h include/slist.h diff --git a/lib/Makefile.am b/lib/Makefile.am index cfcbce1..172bb47 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -23,5 +23,5 @@ libiscsi_la_CPPFLAGS = -I../include -I$(srcdir)/include \ AM_CFLAGS=$(WARN_CFLAGS) -dist_noinst_DATA = libiscsi.syms +dist_noinst_DATA = libiscsi.syms libiscsi.def