diff options
| -rw-r--r-- | java/Makefile.am | 62 | ||||
| -rw-r--r-- | lasso/Makefile.am | 32 | ||||
| -rw-r--r-- | php/Makefile.am | 13 |
3 files changed, 35 insertions, 72 deletions
diff --git a/java/Makefile.am b/java/Makefile.am index 8b0bd5b2..59534ef3 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -1,58 +1,42 @@ - -NULL= # Define the java module -JAVA_MODULE=lasso +JAVA_MODULE = lasso # Define java package name -JAVA_PACKAGE=com.entrouvert.lasso +JAVA_PACKAGE = com.entrouvert.lasso # Define java Package directory, the tailing '/' is mandatory. -JAVA_PATH=com/entrouvert/lasso/ -JDK_INCLUDES=@JDK_INCLUDE@ -CLASSPATH=. +JAVA_PATH = com/entrouvert/lasso/ +JDK_INCLUDES = @JDK_INCLUDE@ +CLASSPATH = . -javalibdir=$(prefix)/lib/java -javasharedir=$(prefix)/share/java +javalibdir = $(prefix)/lib/java +javasharedir = $(prefix)/share/java # Shared library. -javalib_LTLIBRARIES=libjlasso.la +javalib_LTLIBRARIES = libjlasso.la -libjlasso_la_SOURCES= $(JAVA_MODULE)_wrap.c -libjlasso_la_CFLAGS= $(JDK_INCLUDES) \ +libjlasso_la_SOURCES = $(JAVA_MODULE)_wrap.c +libjlasso_la_CFLAGS = $(JDK_INCLUDES) \ $(LASSO_CFLAGS) \ - -I$(top_srcdir) -I$(top_srcdir)/lasso \ - $(NULL) -libjlasso_la_LIBADD= $(top_builddir)/lasso/liblasso.la \ - $(LASSO_LIBS) \ - $(NULL) -libjlasso_la_LDFLAGS= -no-undefined \ - -version-info @LASSO_VERSION_INFO@ \ - -avoid-version -module \ - $(NULL) - -# Java package -javashare_DATA=lasso.jar -JAVA_JAR=lasso.jar + -I$(top_srcdir) -I$(top_srcdir)/lasso -SWIG_OUTPUTS=$(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in -JAVA_CRUFT=$(JAVA_PATH)$(JAVA_MODULE).class $(JAVA_MODULE)_wrap.o \ -$(JAVA_JAR) \ -$(JAVA_PATH)$(JAVA_MODULE)JNI.java +libjlasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) -# Sources file in order to beautifully (and so humanly) wrap lasso. -JAVA_SOURCE_FILES=$(NULL) - -# Bytecode version of the java source files. -JAVA_CLASS_FILES=$(NULL) +libjlasso_la_LDFLAGS = -no-undefined -avoid-version -module +# Java package +javashare_DATA = lasso.jar +JAVA_JAR = lasso.jar -SUBDIRS= +SWIG_OUTPUTS = $(JAVA_PATH)$(JAVA_MODULE).java $(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in +JAVA_CRUFT = $(JAVA_PATH)$(JAVA_MODULE).class $(JAVA_MODULE)_wrap.o \ + $(JAVA_JAR) \ + $(JAVA_PATH)$(JAVA_MODULE)JNI.java # The SWIG outputs are included in the distribution so SWIG is not # required to use the Java interface -EXTRA_DIST= lasso-fragment.java \ - $(SWIG_OUTPUTS) +EXTRA_DIST = lasso-fragment.java $(SWIG_OUTPUTS) -CLEANFILES=$(JAVA_CRUFT) -MAINTAINERCLEANFILES=$(SWIG_OUTPUTS) +CLEANFILES = $(JAVA_CRUFT) +MAINTAINERCLEANFILES = $(SWIG_OUTPUTS) $(JAVA_MODULE)_wrap.c $(JAVA_MODULE).java.in: $(srcdir)/../swig/Lasso.i diff --git a/lasso/Makefile.am b/lasso/Makefile.am index 31f0dc6c..f6c42783 100644 --- a/lasso/Makefile.am +++ b/lasso/Makefile.am @@ -1,4 +1,3 @@ -NULL = SUBDIRS = xml protocols environs liblassoincludedir = $(includedir)/lasso @@ -7,11 +6,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/lasso \ $(LASSO_DEFINES) \ - $(LASSO_CFLAGS) \ - $(NULL) - -EXTRA_DIST = \ - $(NULL) + $(LASSO_CFLAGS) ## Added to activate libtool 1.5.6 windows resources partial support LTRCCOMPILE = $(LIBTOOL) --tag=RC --mode=compile $(RC) \ @@ -23,19 +18,11 @@ lasso.rc.lo: ../win32/lasso.rc $(LTRCCOMPILE) -i $< -o $@ -lib_LTLIBRARIES = \ - liblasso.la \ - $(NULL) +lib_LTLIBRARIES = liblasso.la -liblassoinclude_HEADERS = \ - export.h \ - lasso.h \ - lasso_config.h \ - $(NULL) +liblassoinclude_HEADERS = export.h lasso.h lasso_config.h -liblasso_la_SOURCES = \ - lasso.c \ - $(NULL) +liblasso_la_SOURCES = lasso.c if MINGW liblasso_la_LIBADD = \ @@ -43,20 +30,17 @@ liblasso_la_LIBADD = \ $(top_builddir)/lasso/protocols/liblasso-protocols.la \ $(top_builddir)/lasso/environs/liblasso-environs.la \ $(LASSO_LIBS) \ - lasso.rc.lo \ - $(NULL) + lasso.rc.lo else liblasso_la_LIBADD = \ $(top_builddir)/lasso/xml/liblasso-xml.la \ $(top_builddir)/lasso/protocols/liblasso-protocols.la \ $(top_builddir)/lasso/environs/liblasso-environs.la \ - $(LASSO_LIBS) \ - $(NULL) + $(LASSO_LIBS) endif # Just make damn sure the ABI stays the same between # upgrades. # Obviously if you don't, fixing the situation up again can be painful. -liblasso_la_LDFLAGS = \ - -no-undefined -version-info @LASSO_VERSION_INFO@ \ - $(NULL) +liblasso_la_LDFLAGS = -no-undefined -version-info @LASSO_VERSION_INFO@ + diff --git a/php/Makefile.am b/php/Makefile.am index 5938b586..42b89216 100644 --- a/php/Makefile.am +++ b/php/Makefile.am @@ -10,8 +10,7 @@ INCLUDES = \ -I$(top_srcdir)/lasso \ $(LASSO_DEFINES) \ $(LASSO_CFLAGS) \ - $(PHP_INCLUDES) \ - $(NULL) + $(PHP_INCLUDES) mylibs = $(top_builddir)/lasso/liblasso.la @@ -21,15 +20,11 @@ LASSOSOURCES = \ lasso.h \ php_lasso.h -lib_LTLIBRARIES = lasso.la \ - $(NULL) +lib_LTLIBRARIES = lasso.la prefix=@PHP_PREFIX@ libdir=@PHP_EXTENSION_DIR@ lasso_la_SOURCES = $(LASSOSOURCES) -lasso_la_LIBADD = $(mylibs) \ - $(LASSO_LIBS) \ - ./environs/libenvirons.a \ - ./xml/libxml.a \ - $(NULL) +lasso_la_LIBADD = $(mylibs) $(LASSO_LIBS) ./environs/libenvirons.a ./xml/libxml.a + |