Changeset 70

Show
Ignore:
Timestamp:
09/16/05 13:52:40 (3 years ago)
Author:
conrad
Message:

bundle auxiliarly libraries libjhash and datatypes directly into libblossom

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • blossom/trunk/src/Makefile.am

    r68 r70  
    11## Process this file with automake to produce Makefile.in 
    22 
    3 #SUBDIRS = libjhash datatypes libblossom tools examples tests 
    4 SUBDIRS = libjhash datatypes libblossom tools cgi-bin 
    5  
    6 ## Do not edit or modify anything in this comment block. 
    7 ## The following line is a file identity tag for the GNU Arch 
    8 ## revision control system. 
    9 ## 
    10 ## arch-tag: 4A142BDA-BF88-11D8-A486-000A95C7E2B6 
     3#SUBDIRS = libblossom tools examples tests 
     4SUBDIRS = libblossom tools cgi-bin 

  • blossom/trunk/src/Makefile.in

    r68 r70  
    168168target_vendor = @target_vendor@ 
    169169 
    170 #SUBDIRS = libjhash datatypes libblossom tools examples tests 
    171 SUBDIRS = libjhash datatypes libblossom tools cgi-bin 
     170#SUBDIRS = libblossom tools examples tests 
     171SUBDIRS = libblossom tools cgi-bin 
    172172all: all-recursive 
    173173 

  • blossom/trunk/src/libblossom/Makefile.am

    r68 r70  
    99noinst_HEADERS = \ 
    1010        private.h \ 
    11         xini.h 
     11        jhash.h \ 
     12        dictionary.h \ 
     13        xini.h \ 
     14        x_tree.h 
    1215 
    1316# Libraries to build 
    …… 
    1821        config.c \ 
    1922        datestamp.c \ 
     23        dictionary.c \ 
    2024        flavour.c \ 
    2125        input.c \ 
     26        jhash.c \ 
    2227        path.c \ 
    2328        template.c \ 
    24         xini.c 
     29        xini.c \ 
     30        x_tree.c 
    2531 
    2632libblossom_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@ 
    27 libblossom_la_LIBADD = \ 
    28         $(top_builddir)/src/libjhash/libjhash.a \ 
    29         $(top_builddir)/src/datatypes/libdatatypes.a 
    3033 
     34##TESTS = jhash-test 
    3135##TESTS = xini-test 
     36##TESTS = dictionary-test 
    3237 
    3338##noinst_PROGRAMS = $(TESTS) 
    3439 
     40##jhash_test_SOURCES = jhash-test.c jhash.c 
     41 
     42##dictionary_test_SOURCES = dictionary-test.c dictionary.c x_tree.c jhash.c 
    3543##xini_test_SOURCES = xini.c xini.h xini-test.c 
    36 ## Do not edit or modify anything in this comment block. 
    37 ## The following line is a file identity tag for the GNU Arch 
    38 ## revision control system. 
    39 ## 
    40 ## arch-tag: 4A0A1468-BF88-11D8-88D7-000A95C7E2B6 

  • blossom/trunk/src/libblossom/Makefile.in

    r68 r70  
    5252libLTLIBRARIES_INSTALL = $(INSTALL) 
    5353LTLIBRARIES = $(lib_LTLIBRARIES) 
    54 libblossom_la_DEPENDENCIES = $(top_builddir)/src/libjhash/libjhash.a \ 
    55         $(top_builddir)/src/datatypes/libdatatypes.a 
     54libblossom_la_LIBADD = 
    5655am_libblossom_la_OBJECTS = blossom.lo config.lo datestamp.lo \ 
    57         flavour.lo input.lo path.lo template.lo xini.lo 
     56        dictionary.lo flavour.lo input.lo jhash.lo path.lo template.lo \ 
     57        xini.lo x_tree.lo 
    5858libblossom_la_OBJECTS = $(am_libblossom_la_OBJECTS) 
    5959DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 
    …… 
    6161am__depfiles_maybe = depfiles 
    6262@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/blossom.Plo ./$(DEPDIR)/config.Plo \ 
    63 @AMDEP_TRUE@    ./$(DEPDIR)/datestamp.Plo ./$(DEPDIR)/flavour.Plo \ 
    64 @AMDEP_TRUE@    ./$(DEPDIR)/input.Plo ./$(DEPDIR)/path.Plo \ 
    65 @AMDEP_TRUE@    ./$(DEPDIR)/template.Plo ./$(DEPDIR)/xini.Plo 
     63@AMDEP_TRUE@    ./$(DEPDIR)/datestamp.Plo \ 
     64@AMDEP_TRUE@    ./$(DEPDIR)/dictionary.Plo ./$(DEPDIR)/flavour.Plo \ 
     65@AMDEP_TRUE@    ./$(DEPDIR)/input.Plo ./$(DEPDIR)/jhash.Plo \ 
     66@AMDEP_TRUE@    ./$(DEPDIR)/path.Plo ./$(DEPDIR)/template.Plo \ 
     67@AMDEP_TRUE@    ./$(DEPDIR)/x_tree.Plo ./$(DEPDIR)/xini.Plo 
    6668COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 
    6769        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
    …… 
    194196noinst_HEADERS = \ 
    195197        private.h \ 
    196         xini.h 
     198        jhash.h \ 
     199        dictionary.h \ 
     200        xini.h \ 
     201        x_tree.h 
    197202 
    198203 
    …… 
    203208        config.c \ 
    204209        datestamp.c \ 
     210        dictionary.c \ 
    205211        flavour.c \ 
    206212        input.c \ 
     213        jhash.c \ 
    207214        path.c \ 
    208215        template.c \ 
    209         xini.c 
     216        xini.c \ 
     217        x_tree.c 
    210218 
    211219libblossom_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@ 
    212 libblossom_la_LIBADD = \ 
    213         $(top_builddir)/src/libjhash/libjhash.a \ 
    214         $(top_builddir)/src/datatypes/libdatatypes.a 
    215  
    216220all: all-am 
    217221 
    …… 
    288292@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@ 
    289293@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/datestamp.Plo@am__quote@ 
     294@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dictionary.Plo@am__quote@ 
    290295@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flavour.Plo@am__quote@ 
    291296@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input.Plo@am__quote@ 
     297@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jhash.Plo@am__quote@ 
    292298@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Plo@am__quote@ 
    293299@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/template.Plo@am__quote@ 
     300@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x_tree.Plo@am__quote@ 
    294301@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xini.Plo@am__quote@ 
    295302