[ghemical-devel] Suggestion: Move libghemical's headers to $(includedir)/ghemical

[Michael Banck]

--r5Pyd7+fXNt84Ff3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,

most projects I know put their header files into $(includedir)/foo and
not $(includedir)/libfoo and I think that's much better looking (also
for the #include lines of projects using the library).

The attached patch does this and also makes libghemical.pc being
installed int $(libdir)/pkgconfig/. It also includes the two missing
header files and cleans up Makefile.am a bit.

The #include's in ghemical would need to be modified, I can send a patch
for this as well, as I just did that to test the change anyway.

These are the verbose changes:

2004-08-25 18:43  mbanck

        * Makefile.am (pkgconfigdir, pkgconfig_DATA): New variables.
        * libghemical.pc.in: Use ${includedir}/ghemical instead of
        ${includedir}/libghemical for Cflags.
        * src/Makefile.am: Do not include Makefile.include.
        (libghemical_headers): Renamed to ...
        (libghemicalinclude_HEADERS): ... this.
        (libghemicalincludedir): New variable.
        (libghemicalinclude_HEADERS): Added pop_ana.h and resonance.h.
        (libghemical_la_LDFLAGS): Removed.
        (libghemical_INCLUDES): Likewise.
        (ghemicalinclude_HEADERS): Likewise.
        (ghemicalincludedir): Likewise.


cheers,

Michael

--r5Pyd7+fXNt84Ff3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="libghemical.diff"

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libghemical/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- Makefile.am	13 Aug 2004 12:14:46 -0000	1.1
+++ Makefile.am	25 Aug 2004 16:36:44 -0000
@@ -1,3 +1,6 @@
 SUBDIRS = src bin
 
 EXTRA_DIST = libghemical.spec
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libghemical.pc
Index: libghemical.pc.in
===================================================================
RCS file: /cvsroot/libghemical/libghemical.pc.in,v
retrieving revision 1.2
diff -u -r1.2 libghemical.pc.in
--- libghemical.pc.in	13 May 2004 11:45:27 -0000	1.2
+++ libghemical.pc.in	25 Aug 2004 16:36:44 -0000
@@ -1,10 +1,10 @@
 prefix=@prefix@
-libdir=${prefix}/lib
-includedir=${prefix}/include
-pkgincludedir=${includedir}/libghemical
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 Name: libghemical
 Description: A library that contains molecular modelling functionality.
 Version: @LIBVERSION@
 Libs: -L${libdir} -lghemical
-Cflags: -I${pkgincludedir}
+Cflags: -I${includedir}/ghemical
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/libghemical/src/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- src/Makefile.am	25 Aug 2004 11:13:43 -0000	1.2
+++ src/Makefile.am	25 Aug 2004 16:36:44 -0000
@@ -1,5 +1,3 @@
-include Makefile.include
-
 lib_LTLIBRARIES = libghemical.la
 
 libghemical_la_SOURCES = \
@@ -21,18 +19,12 @@
 		geomopt.cpp moldyn.cpp \
 		pop_ana.cpp resonance.cpp
 
-libghemical_headers = \
+libghemicalincludedir = $(includedir)/ghemical
+libghemicalinclude_HEADERS = \
 	atom.h      eng1_mm_default.h  eng1_qm_mpqc.h  engine.h     libdefine.h  search.h          typedef.h \
 	bond.h      eng1_mm_prmfit.h   eng1_sf.h       geomopt.h    model.h      seqbuild.h        typerule.h \
 	conjgrad.h  eng1_qm.h          eng2_mm_sf.h    intcrd.h     moldyn.h     tab_mm_default.h  utility.h \
-	eng1_mm.h   eng1_qm_mopac.h    eng2_qm_mm.h    libconfig.h  notice.h     tab_mm_prmfit.h   v3d.h
-
-ghemicalincludedir = $(includedir)/libghemical
-ghemicalinclude_HEADERS = ${libghemical_headers}
-
-libghemical_la_LDFLAGS = @LIBS@
-
-libghemical_INCLUDES = -I$(top_builddir)/src @SC_CPPFLAGS@
-##INCLUDES = @INCLUDES@ @SC_CPPFLAGS@
+	eng1_mm.h   eng1_qm_mopac.h    eng2_qm_mm.h    libconfig.h  notice.h     tab_mm_prmfit.h   v3d.h \
+	pop_ana.h   resonance.h
 
 EXTRA_DIST = Doxyfile

--r5Pyd7+fXNt84Ff3--