From: levill_r <levill_r@4aad255d-cdde-0310-9447-f3009e2ae8c0> * src/Makefile.am: Aesthetic changes. (dyn_light_hh_DEPENDECIES, dyn_all_hh_DEPENDECIES): Rename as... (dyn_light_hh_deps, dyn_all_hh_deps): ...this. (BUILT_SOURCES): List only #include'd header and remove files that will be built anyway. (CLEANFILES): Adjust. (libdyn_la_DEPENDENCIES): s/LIBLTDL/LTDLDEPS/. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4653 4aad255d-cdde-0310-9447-f3009e2ae8c0 --- dynamic-use-of-static-c++/ChangeLog | 14 ++++ dynamic-use-of-static-c++/src/Makefile.am | 102 +++++++++++++++-------------- 2 files changed, 66 insertions(+), 50 deletions(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index 0cb57c3..a8c3708 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,3 +1,17 @@ +2009-10-20 Roland Levillain <roland@lrde.epita.fr> + + Various fixes in src/Makefile.am. + + * src/Makefile.am: Aesthetic changes. + (dyn_light_hh_DEPENDECIES, dyn_all_hh_DEPENDECIES): + Rename as... + (dyn_light_hh_deps, dyn_all_hh_deps): + ...this. + (BUILT_SOURCES): List only #include'd header and remove files that + will be built anyway. + (CLEANFILES): Adjust. + (libdyn_la_DEPENDENCIES): s/LIBLTDL/LTDLDEPS/. + 2009-10-14 Roland Levillain <roland@lrde.epita.fr> Address compilation warnings. diff --git a/dynamic-use-of-static-c++/src/Makefile.am b/dynamic-use-of-static-c++/src/Makefile.am index d64c2ea..0bb8cea 100644 --- a/dynamic-use-of-static-c++/src/Makefile.am +++ b/dynamic-use-of-static-c++/src/Makefile.am @@ -3,55 +3,57 @@ lib_LTLIBRARIES = libdyn.la ERB = ruby $(top_srcdir)/config/erbx -dyn_light_hh_DEPENDECIES = \ - $(srcdir)/name_of.hh \ - function.hh \ - all_methods.hh \ - data.hh \ - $(srcdir)/policy.hh - -dyn_all_hh_DEPENDECIES = \ - config.hh \ - $(srcdir)/name_of.hh \ - function.hh \ - all_methods.hh \ - data.hh \ - $(srcdir)/data.hxx \ - $(srcdir)/function_loader.hh \ - $(srcdir)/dyn.hh - -BUILT_SOURCES = \ - dyn-all.hh dyn-light.hh \ - all_methods.hh all_methods.cc \ - function.hh function.cc \ - data.hh config.hh - -libdyn_la_SOURCES = \ - dyn.hh \ - data.hh data.hxx data.cc \ - all_methods.hh all_methods.cc \ - function.hh function.cc \ - function_loader.hh function_loader.cc \ - name_of.hh name_of.cc \ - policy.hh policy.cc \ - ruby_stream.hh ruby_stream.cc \ - ansidecl.h demangle.h config.hh - -libdyn_la_LIBADD = @LIBERTYARG@ @RUBY_LIBRUBYARG_SHARED@ \ - $(LIBLTDL) - -libdyn_la_DEPENDENCIES = $(LIBLTDL) - -libdyn_la_CPPFLAGS = $(LTDLINCL) \ - -I$(top_builddir) \ - -I$(srcdir) -I. -I@RUBY_topdir@ - +dyn_light_hh_deps = \ + $(srcdir)/name_of.hh \ + function.hh \ + all_methods.hh \ + data.hh \ + $(srcdir)/policy.hh + +dyn_all_hh_deps = \ + config.hh \ + $(srcdir)/name_of.hh \ + function.hh \ + all_methods.hh \ + data.hh \ + $(srcdir)/data.hxx \ + $(srcdir)/function_loader.hh \ + $(srcdir)/dyn.hh + +# Ask Make to build these first since they are #include'd. +BUILT_SOURCES = \ + all_methods.hh \ + function.hh \ + data.hh \ + config.hh + +# Clean generated files. +CLEANFILES = \ + $(BUILT_SOURCES) \ + dyn-all.hh \ + dyn-light.hh \ + all_methods.cc \ + function.cc + +libdyn_la_SOURCES = \ + dyn.hh \ + data.hh data.hxx data.cc \ + all_methods.hh all_methods.cc \ + function.hh function.cc \ + function_loader.hh function_loader.cc \ + name_of.hh name_of.cc \ + policy.hh policy.cc \ + ruby_stream.hh ruby_stream.cc \ + ansidecl.h demangle.h config.hh + +libdyn_la_LIBADD = @LIBERTYARG@ @RUBY_LIBRUBYARG_SHARED@ $(LIBLTDL) +libdyn_la_DEPENDENCIES = $(LTDLDEPS) + +libdyn_la_CPPFLAGS = \ + $(LTDLINCL) -I$(top_builddir) -I$(srcdir) -I. -I@RUBY_topdir@ libdyn_la_CXXFLAGS = $(WARNING_CXXFLAGS) - libdyn_la_LDFLAGS = -version-info 0:1:0 -CLEANFILES = $(BUILT_SOURCES) - ############# ### RULES ### @@ -59,17 +61,17 @@ CLEANFILES = $(BUILT_SOURCES) cut_local_includes = grep -v '^.[\t ]*include[\t ]*".*"' -dyn-all.hh: $(dyn_all_hh_DEPENDECIES) +dyn-all.hh: $(dyn_all_hh_deps) rm -f $@ echo "// Generated: do not edit by hand!" > $@ echo "#define DYN_FULL_IMPLEMENTATION" >> $@ - cat $(dyn_all_hh_DEPENDECIES) | $(cut_local_includes) >> $@ + cat $(dyn_all_hh_deps) | $(cut_local_includes) >> $@ chmod -w $@ -dyn-light.hh: $(dyn_light_hh_DEPENDECIES) +dyn-light.hh: $(dyn_light_hh_deps) rm -f $@ echo "// Generated: do not edit by hand!" > $@ - cat $(dyn_light_hh_DEPENDECIES) | $(cut_local_includes) >> $@ + cat $(dyn_light_hh_deps) | $(cut_local_includes) >> $@ chmod -w $@ %.hh: %.erb.hh -- 1.6.5