summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a4689b..92d8df8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,17 @@
+CC=gdc
+
lib_LTLIBRARIES = libtestshlibrary.la
-libtestshlibrary_la_SOURCES = testshlibrary.d
-libtestshlibrary_la_LDFLAGS = -version-info 0:0:0 -module
+libtestshlibrary_la_SOURCES = testshlibrary.d
+libtestshlibrary_la_LDFLAGS = -version-info 0:0:0
-noinst_LIBRARIES = libtestlibrary.a
+lib_LIBRARIES = libtestlibrary.a
libtestlibrary_a_SOURCES = testlibrary.d
+# include_HEADERS = testshlibrary.di testlibrary.di
+
bin_PROGRAMS = helloworld
-helloworld_SOURCES = helloworld.d catalog.d testshlibrary.d
-helloworld_LDADD = $(DEPS_LIBS) $(top_srcdir)/config.d libtestlibrary.a libtestshlibrary.la
-# It seems by overriding the _LINK primary, libtool is not called correctly
-# Requires fixing in the libtool macros/scripts
-CC=gdc
-#helloworld_LINK = $(GDC) $(DFLAGS) -o $@
+helloworld_SOURCES = helloworld.d catalog.d
+helloworld_LDADD = $(DEPS_LIBS) $(top_srcdir)/config.d libtestlibrary.a testshlibrary.d libtestshlibrary.la
DFLAGS += -I$(top_srcdir) -I$(srcdir)