Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5463 in orxonox.OLD for trunk/src/lib/graphics


Ignore:
Timestamp:
Nov 1, 2005, 11:09:15 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: removed LIBTOOL again

Location:
trunk/src/lib/graphics
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/Makefile.am

    r5452 r5463  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 pkglib_LTLIBRARIES = libORXgraphics.la
     4noinst_LIBRARIES = libORXgraphics.a
    55
    6 libORXgraphics_la_SOURCES = graphics_engine.cc \
    7                             light.cc \
    8                             shader.cc \
    9                             render2D/render_2d.cc \
    10                             render2D/element_2d.cc \
    11                             text_engine/text_engine.cc \
    12                             text_engine/text.cc \
    13                             text_engine/font.cc
     6libORXgraphics_a_SOURCES = graphics_engine.cc \
     7                           light.cc \
     8                           shader.cc \
     9                           render2D/render_2d.cc \
     10                           render2D/element_2d.cc \
     11                           text_engine/text_engine.cc \
     12                           text_engine/text.cc \
     13                           text_engine/font.cc
    1414
    1515noinst_HEADERS = graphics_engine.h \

  • trunk/src/lib/graphics/Makefile.in

    r5452 r5463  
    1616
    1717
    18 SOURCES = $(libORXgraphics_la_SOURCES)
     18SOURCES = $(libORXgraphics_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 am__installdirs = "$(DESTDIR)$(pkglibdir)"
    52 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
    53 LTLIBRARIES = $(pkglib_LTLIBRARIES)
    54 libORXgraphics_la_LIBADD =
    55 am_libORXgraphics_la_OBJECTS = graphics_engine.lo light.lo shader.lo \
    56         render_2d.lo element_2d.lo text_engine.lo text.lo font.lo
    57 libORXgraphics_la_OBJECTS = $(am_libORXgraphics_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXgraphics_a_AR = $(AR) $(ARFLAGS)
     55libORXgraphics_a_LIBADD =
     56am_libORXgraphics_a_OBJECTS = graphics_engine.$(OBJEXT) \
     57        light.$(OBJEXT) shader.$(OBJEXT) render_2d.$(OBJEXT) \
     58        element_2d.$(OBJEXT) text_engine.$(OBJEXT) text.$(OBJEXT) \
     59        font.$(OBJEXT)
     60libORXgraphics_a_OBJECTS = $(am_libORXgraphics_a_OBJECTS)
    5861DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5962depcomp = $(SHELL) $(top_srcdir)/depcomp
    6063am__depfiles_maybe = depfiles
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/element_2d.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/font.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Plo \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/light.Plo ./$(DEPDIR)/render_2d.Plo \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/shader.Plo ./$(DEPDIR)/text.Plo \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Plo
     64@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/element_2d.Po ./$(DEPDIR)/font.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/render_2d.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/shader.Po ./$(DEPDIR)/text.Po \
     68@AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po
    6769CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6870        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    69 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    70         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    71         $(AM_CXXFLAGS) $(CXXFLAGS)
    7271CXXLD = $(CXX)
    73 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    74         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    75 SOURCES = $(libORXgraphics_la_SOURCES)
    76 DIST_SOURCES = $(libORXgraphics_la_SOURCES)
     72CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     73        -o $@
     74SOURCES = $(libORXgraphics_a_SOURCES)
     75DIST_SOURCES = $(libORXgraphics_a_SOURCES)
    7776RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    7877        html-recursive info-recursive install-data-recursive \
    … …  
    9089AMDEP_TRUE = @AMDEP_TRUE@
    9190AMTAR = @AMTAR@
    92 AR = @AR@
    9391AUTOCONF = @AUTOCONF@
    9492AUTOHEADER = @AUTOHEADER@
    … …  
    103101CURL_LIBS = @CURL_LIBS@
    104102CXX = @CXX@
    105 CXXCPP = @CXXCPP@
    106103CXXDEPMODE = @CXXDEPMODE@
    107104CXXFLAGS = @CXXFLAGS@
    … …  
    115112DOXYGEN_FALSE = @DOXYGEN_FALSE@
    116113DOXYGEN_TRUE = @DOXYGEN_TRUE@
    117 ECHO = @ECHO@
    118114ECHO_C = @ECHO_C@
    119115ECHO_N = @ECHO_N@
    … …  
    121117EGREP = @EGREP@
    122118EXEEXT = @EXEEXT@
    123 F77 = @F77@
    124 FFLAGS = @FFLAGS@
    125119GPROF = @GPROF@
    126120GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    137131LIBOBJS = @LIBOBJS@
    138132LIBS = @LIBS@
    139 LIBTOOL = @LIBTOOL@
    140 LN_S = @LN_S@
    141133LTLIBOBJS = @LTLIBOBJS@
    142134MAKEINFO = @MAKEINFO@
    … …  
    158150SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    159151VERSION = @VERSION@
    160 ac_ct_AR = @ac_ct_AR@
    161152ac_ct_CC = @ac_ct_CC@
    162153ac_ct_CXX = @ac_ct_CXX@
    163 ac_ct_F77 = @ac_ct_F77@
    164154ac_ct_RANLIB = @ac_ct_RANLIB@
    165155ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    204194target_vendor = @target_vendor@
    205195MAINSRCDIR = ../..
    206 pkglib_LTLIBRARIES = libORXgraphics.la
    207 libORXgraphics_la_SOURCES = graphics_engine.cc \
    208                             light.cc \
    209                             shader.cc \
    210                             render2D/render_2d.cc \
    211                             render2D/element_2d.cc \
    212                             text_engine/text_engine.cc \
    213                             text_engine/text.cc \
    214                             text_engine/font.cc
     196noinst_LIBRARIES = libORXgraphics.a
     197libORXgraphics_a_SOURCES = graphics_engine.cc \
     198                           light.cc \
     199                           shader.cc \
     200                           render2D/render_2d.cc \
     201                           render2D/element_2d.cc \
     202                           text_engine/text_engine.cc \
     203                           text_engine/text.cc \
     204                           text_engine/font.cc
    215205
    216206noinst_HEADERS = graphics_engine.h \
    … …  
    230220
    231221.SUFFIXES:
    232 .SUFFIXES: .cc .lo .o .obj
     222.SUFFIXES: .cc .o .obj
    233223$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    234224        @for dep in $?; do \
    … …  
    240230          esac; \
    241231        done; \
    242         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
     232        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
    243233        cd $(top_srcdir) && \
    244           $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
     234          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
    245235.PRECIOUS: Makefile
    246236Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    260250$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    261251        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    262 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    263         @$(NORMAL_INSTALL)
    264         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    265         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    266           if test -f $$p; then \
    267             f="`echo $$p | sed -e 's|^.*/||'`"; \
    268             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    269             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    270           else :; fi; \
    271         done
    272 
    273 uninstall-pkglibLTLIBRARIES:
    274         @$(NORMAL_UNINSTALL)
    275         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    276             p="`echo $$p | sed -e 's|^.*/||'`"; \
    277           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    278           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    279         done
    280 
    281 clean-pkglibLTLIBRARIES:
    282         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    283         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    284           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    285           test "$$dir" != "$$p" || dir=.; \
    286           echo "rm -f \"$${dir}/so_locations\""; \
    287           rm -f "$${dir}/so_locations"; \
    288         done
    289 libORXgraphics.la: $(libORXgraphics_la_OBJECTS) $(libORXgraphics_la_DEPENDENCIES)
    290         $(CXXLINK) -rpath $(pkglibdir) $(libORXgraphics_la_LDFLAGS) $(libORXgraphics_la_OBJECTS) $(libORXgraphics_la_LIBADD) $(LIBS)
     252
     253clean-noinstLIBRARIES:
     254        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     255libORXgraphics.a: $(libORXgraphics_a_OBJECTS) $(libORXgraphics_a_DEPENDENCIES)
     256        -rm -f libORXgraphics.a
     257        $(libORXgraphics_a_AR) libORXgraphics.a $(libORXgraphics_a_OBJECTS) $(libORXgraphics_a_LIBADD)
     258        $(RANLIB) libORXgraphics.a
    291259
    292260mostlyclean-compile:
    … …  
    296264        -rm -f *.tab.c
    297265
    298 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/element_2d.Plo@am__quote@
    299 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font.Plo@am__quote@
    300 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Plo@am__quote@
    301 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Plo@am__quote@
    302 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/render_2d.Plo@am__quote@
    303 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shader.Plo@am__quote@
    304 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Plo@am__quote@
    305 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Plo@am__quote@
     266@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/element_2d.Po@am__quote@
     267@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font.Po@am__quote@
     268@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
     269@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
     270@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/render_2d.Po@am__quote@
     271@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shader.Po@am__quote@
     272@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Po@am__quote@
     273@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Po@am__quote@
    306274
    307275.cc.o:
    … …  
    321289@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    322290
    323 .cc.lo:
    324 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    325 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    326 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    327 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    328 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    329 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    330 
    331291render_2d.o: render2D/render_2d.cc
    332292@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT render_2d.o -MD -MP -MF "$(DEPDIR)/render_2d.Tpo" -c -o render_2d.o `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc; \
    … …  
    345305@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.obj `if test -f 'render2D/render_2d.cc'; then $(CYGPATH_W) 'render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/render_2d.cc'; fi`
    346306
    347 render_2d.lo: render2D/render_2d.cc
    348 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT render_2d.lo -MD -MP -MF "$(DEPDIR)/render_2d.Tpo" -c -o render_2d.lo `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc; \
    349 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/render_2d.Tpo" "$(DEPDIR)/render_2d.Plo"; else rm -f "$(DEPDIR)/render_2d.Tpo"; exit 1; fi
    350 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/render_2d.cc' object='render_2d.lo' libtool=yes @AMDEPBACKSLASH@
    351 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/render_2d.Plo' tmpdepfile='$(DEPDIR)/render_2d.TPlo' @AMDEPBACKSLASH@
    352 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    353 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o render_2d.lo `test -f 'render2D/render_2d.cc' || echo '$(srcdir)/'`render2D/render_2d.cc
    354 
    355307element_2d.o: render2D/element_2d.cc
    356308@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT element_2d.o -MD -MP -MF "$(DEPDIR)/element_2d.Tpo" -c -o element_2d.o `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc; \
    … …  
    369321@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.obj `if test -f 'render2D/element_2d.cc'; then $(CYGPATH_W) 'render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/render2D/element_2d.cc'; fi`
    370322
    371 element_2d.lo: render2D/element_2d.cc
    372 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT element_2d.lo -MD -MP -MF "$(DEPDIR)/element_2d.Tpo" -c -o element_2d.lo `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc; \
    373 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/element_2d.Tpo" "$(DEPDIR)/element_2d.Plo"; else rm -f "$(DEPDIR)/element_2d.Tpo"; exit 1; fi
    374 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='render2D/element_2d.cc' object='element_2d.lo' libtool=yes @AMDEPBACKSLASH@
    375 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/element_2d.Plo' tmpdepfile='$(DEPDIR)/element_2d.TPlo' @AMDEPBACKSLASH@
    376 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    377 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o element_2d.lo `test -f 'render2D/element_2d.cc' || echo '$(srcdir)/'`render2D/element_2d.cc
    378 
    379323text_engine.o: text_engine/text_engine.cc
    380324@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_engine.o -MD -MP -MF "$(DEPDIR)/text_engine.Tpo" -c -o text_engine.o `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc; \
    … …  
    393337@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f 'text_engine/text_engine.cc'; then $(CYGPATH_W) 'text_engine/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text_engine.cc'; fi`
    394338
    395 text_engine.lo: text_engine/text_engine.cc
    396 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_engine.lo -MD -MP -MF "$(DEPDIR)/text_engine.Tpo" -c -o text_engine.lo `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc; \
    397 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text_engine.Tpo" "$(DEPDIR)/text_engine.Plo"; else rm -f "$(DEPDIR)/text_engine.Tpo"; exit 1; fi
    398 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text_engine.cc' object='text_engine.lo' libtool=yes @AMDEPBACKSLASH@
    399 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text_engine.Plo' tmpdepfile='$(DEPDIR)/text_engine.TPlo' @AMDEPBACKSLASH@
    400 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    401 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.lo `test -f 'text_engine/text_engine.cc' || echo '$(srcdir)/'`text_engine/text_engine.cc
    402 
    403339text.o: text_engine/text.cc
    404340@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.o -MD -MP -MF "$(DEPDIR)/text.Tpo" -c -o text.o `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc; \
    … …  
    417353@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.obj `if test -f 'text_engine/text.cc'; then $(CYGPATH_W) 'text_engine/text.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/text.cc'; fi`
    418354
    419 text.lo: text_engine/text.cc
    420 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text.lo -MD -MP -MF "$(DEPDIR)/text.Tpo" -c -o text.lo `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc; \
    421 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/text.Tpo" "$(DEPDIR)/text.Plo"; else rm -f "$(DEPDIR)/text.Tpo"; exit 1; fi
    422 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/text.cc' object='text.lo' libtool=yes @AMDEPBACKSLASH@
    423 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/text.Plo' tmpdepfile='$(DEPDIR)/text.TPlo' @AMDEPBACKSLASH@
    424 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    425 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text.lo `test -f 'text_engine/text.cc' || echo '$(srcdir)/'`text_engine/text.cc
    426 
    427355font.o: text_engine/font.cc
    428356@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.o -MD -MP -MF "$(DEPDIR)/font.Tpo" -c -o font.o `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc; \
    … …  
    440368@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    441369@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.obj `if test -f 'text_engine/font.cc'; then $(CYGPATH_W) 'text_engine/font.cc'; else $(CYGPATH_W) '$(srcdir)/text_engine/font.cc'; fi`
    442 
    443 font.lo: text_engine/font.cc
    444 @am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT font.lo -MD -MP -MF "$(DEPDIR)/font.Tpo" -c -o font.lo `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc; \
    445 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/font.Tpo" "$(DEPDIR)/font.Plo"; else rm -f "$(DEPDIR)/font.Tpo"; exit 1; fi
    446 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='text_engine/font.cc' object='font.lo' libtool=yes @AMDEPBACKSLASH@
    447 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/font.Plo' tmpdepfile='$(DEPDIR)/font.TPlo' @AMDEPBACKSLASH@
    448 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    449 @am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o font.lo `test -f 'text_engine/font.cc' || echo '$(srcdir)/'`text_engine/font.cc
    450 
    451 mostlyclean-libtool:
    452         -rm -f *.lo
    453 
    454 clean-libtool:
    455         -rm -rf .libs _libs
    456 
    457 distclean-libtool:
    458         -rm -f libtool
    459370uninstall-info-am:
    460371
    … …  
    622533check-am: all-am
    623534check: check-recursive
    624 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     535all-am: Makefile $(LIBRARIES) $(HEADERS)
    625536installdirs: installdirs-recursive
    626537installdirs-am:
    627         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    628           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    629         done
    630538install: install-recursive
    631539install-exec: install-exec-recursive
    … …  
    654562clean: clean-recursive
    655563
    656 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    657         mostlyclean-am
     564clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    658565
    659566distclean: distclean-recursive
    … …  
    661568        -rm -f Makefile
    662569distclean-am: clean-am distclean-compile distclean-generic \
    663         distclean-libtool distclean-tags
     570        distclean-tags
    664571
    665572dvi: dvi-recursive
    … …  
    675582install-data-am:
    676583
    677 install-exec-am: install-pkglibLTLIBRARIES
     584install-exec-am:
    678585
    679586install-info: install-info-recursive
    … …  
    690597mostlyclean: mostlyclean-recursive
    691598
    692 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    693         mostlyclean-libtool
     599mostlyclean-am: mostlyclean-compile mostlyclean-generic
    694600
    695601pdf: pdf-recursive
    … …  
    701607ps-am:
    702608
    703 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     609uninstall-am: uninstall-info-am
    704610
    705611uninstall-info: uninstall-info-recursive
    706612
    707613.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    708         clean clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    709         clean-recursive ctags ctags-recursive distclean \
    710         distclean-compile distclean-generic distclean-libtool \
    711         distclean-recursive distclean-tags distdir dvi dvi-am html \
    712         html-am info info-am install install-am install-data \
    713         install-data-am install-exec install-exec-am install-info \
    714         install-info-am install-man install-pkglibLTLIBRARIES \
    715         install-strip installcheck installcheck-am installdirs \
    716         installdirs-am maintainer-clean maintainer-clean-generic \
     614        clean clean-generic clean-noinstLIBRARIES clean-recursive \
     615        ctags ctags-recursive distclean distclean-compile \
     616        distclean-generic distclean-recursive distclean-tags distdir \
     617        dvi dvi-am html html-am info info-am install install-am \
     618        install-data install-data-am install-exec install-exec-am \
     619        install-info install-info-am install-man install-strip \
     620        installcheck installcheck-am installdirs installdirs-am \
     621        maintainer-clean maintainer-clean-generic \
    717622        maintainer-clean-recursive mostlyclean mostlyclean-compile \
    718         mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
    719         pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
    720         uninstall-info-am uninstall-pkglibLTLIBRARIES
     623        mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
     624        tags tags-recursive uninstall uninstall-am uninstall-info-am
    721625
    722626include $(MAINSRCDIR)/defs/include_paths.am

  • trunk/src/lib/graphics/importer/Makefile.am

    r5452 r5463  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 pkglib_LTLIBRARIES = libORXimporter.la
     4noinst_LIBRARIES = libORXimporter.a
    55
    6 libORXimporter_la_SOURCES = model.cc \
    7                             objModel.cc \
    8                             primitive_model.cc \
    9                             md2Model.cc \
    10                             material.cc \
    11                             texture.cc
     6libORXimporter_a_SOURCES = model.cc \
     7                           objModel.cc \
     8                           primitive_model.cc \
     9                           md2Model.cc \
     10                           material.cc \
     11                           texture.cc
    1212
    1313

  • trunk/src/lib/graphics/importer/Makefile.in

    r5452 r5463  
    1616
    1717
    18 SOURCES = $(libORXimporter_la_SOURCES)
     18SOURCES = $(libORXimporter_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 am__installdirs = "$(DESTDIR)$(pkglibdir)"
    52 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
    53 LTLIBRARIES = $(pkglib_LTLIBRARIES)
    54 libORXimporter_la_LIBADD =
    55 am_libORXimporter_la_OBJECTS = model.lo objModel.lo primitive_model.lo \
    56         md2Model.lo material.lo texture.lo
    57 libORXimporter_la_OBJECTS = $(am_libORXimporter_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXimporter_a_AR = $(AR) $(ARFLAGS)
     55libORXimporter_a_LIBADD =
     56am_libORXimporter_a_OBJECTS = model.$(OBJEXT) objModel.$(OBJEXT) \
     57        primitive_model.$(OBJEXT) md2Model.$(OBJEXT) \
     58        material.$(OBJEXT) texture.$(OBJEXT)
     59libORXimporter_a_OBJECTS = $(am_libORXimporter_a_OBJECTS)
    5860DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5961depcomp = $(SHELL) $(top_srcdir)/depcomp
    6062am__depfiles_maybe = depfiles
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Plo ./$(DEPDIR)/model.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/objModel.Plo \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Plo \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/texture.Plo
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/material.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po
    6668CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6769        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    68 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    69         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    70         $(AM_CXXFLAGS) $(CXXFLAGS)
    7170CXXLD = $(CXX)
    72 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    73         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    74 SOURCES = $(libORXimporter_la_SOURCES)
    75 DIST_SOURCES = $(libORXimporter_la_SOURCES)
     71CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     72        -o $@
     73SOURCES = $(libORXimporter_a_SOURCES)
     74DIST_SOURCES = $(libORXimporter_a_SOURCES)
    7675HEADERS = $(noinst_HEADERS)
    7776ETAGS = etags
    … …  
    8281AMDEP_TRUE = @AMDEP_TRUE@
    8382AMTAR = @AMTAR@
    84 AR = @AR@
    8583AUTOCONF = @AUTOCONF@
    8684AUTOHEADER = @AUTOHEADER@
    … …  
    9593CURL_LIBS = @CURL_LIBS@
    9694CXX = @CXX@
    97 CXXCPP = @CXXCPP@
    9895CXXDEPMODE = @CXXDEPMODE@
    9996CXXFLAGS = @CXXFLAGS@
    … …  
    107104DOXYGEN_FALSE = @DOXYGEN_FALSE@
    108105DOXYGEN_TRUE = @DOXYGEN_TRUE@
    109 ECHO = @ECHO@
    110106ECHO_C = @ECHO_C@
    111107ECHO_N = @ECHO_N@
    … …  
    113109EGREP = @EGREP@
    114110EXEEXT = @EXEEXT@
    115 F77 = @F77@
    116 FFLAGS = @FFLAGS@
    117111GPROF = @GPROF@
    118112GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    129123LIBOBJS = @LIBOBJS@
    130124LIBS = @LIBS@
    131 LIBTOOL = @LIBTOOL@
    132 LN_S = @LN_S@
    133125LTLIBOBJS = @LTLIBOBJS@
    134126MAKEINFO = @MAKEINFO@
    … …  
    150142SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    151143VERSION = @VERSION@
    152 ac_ct_AR = @ac_ct_AR@
    153144ac_ct_CC = @ac_ct_CC@
    154145ac_ct_CXX = @ac_ct_CXX@
    155 ac_ct_F77 = @ac_ct_F77@
    156146ac_ct_RANLIB = @ac_ct_RANLIB@
    157147ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    196186target_vendor = @target_vendor@
    197187MAINSRCDIR = ../../..
    198 pkglib_LTLIBRARIES = libORXimporter.la
    199 libORXimporter_la_SOURCES = model.cc \
    200                             objModel.cc \
    201                             primitive_model.cc \
    202                             md2Model.cc \
    203                             material.cc \
    204                             texture.cc
     188noinst_LIBRARIES = libORXimporter.a
     189libORXimporter_a_SOURCES = model.cc \
     190                           objModel.cc \
     191                           primitive_model.cc \
     192                           md2Model.cc \
     193                           material.cc \
     194                           texture.cc
    205195
    206196noinst_HEADERS = abstract_model.h \
    … …  
    217207
    218208.SUFFIXES:
    219 .SUFFIXES: .cc .lo .o .obj
     209.SUFFIXES: .cc .o .obj
    220210$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    221211        @for dep in $?; do \
    … …  
    227217          esac; \
    228218        done; \
    229         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
     219        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
    230220        cd $(top_srcdir) && \
    231           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
     221          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
    232222.PRECIOUS: Makefile
    233223Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    247237$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    248238        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    249 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    250         @$(NORMAL_INSTALL)
    251         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    252         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    253           if test -f $$p; then \
    254             f="`echo $$p | sed -e 's|^.*/||'`"; \
    255             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    256             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    257           else :; fi; \
    258         done
    259 
    260 uninstall-pkglibLTLIBRARIES:
    261         @$(NORMAL_UNINSTALL)
    262         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    263             p="`echo $$p | sed -e 's|^.*/||'`"; \
    264           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    265           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    266         done
    267 
    268 clean-pkglibLTLIBRARIES:
    269         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    270         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    271           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    272           test "$$dir" != "$$p" || dir=.; \
    273           echo "rm -f \"$${dir}/so_locations\""; \
    274           rm -f "$${dir}/so_locations"; \
    275         done
    276 libORXimporter.la: $(libORXimporter_la_OBJECTS) $(libORXimporter_la_DEPENDENCIES)
    277         $(CXXLINK) -rpath $(pkglibdir) $(libORXimporter_la_LDFLAGS) $(libORXimporter_la_OBJECTS) $(libORXimporter_la_LIBADD) $(LIBS)
     239
     240clean-noinstLIBRARIES:
     241        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     242libORXimporter.a: $(libORXimporter_a_OBJECTS) $(libORXimporter_a_DEPENDENCIES)
     243        -rm -f libORXimporter.a
     244        $(libORXimporter_a_AR) libORXimporter.a $(libORXimporter_a_OBJECTS) $(libORXimporter_a_LIBADD)
     245        $(RANLIB) libORXimporter.a
    278246
    279247mostlyclean-compile:
    … …  
    283251        -rm -f *.tab.c
    284252
    285 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Plo@am__quote@
    286 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Plo@am__quote@
    287 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Plo@am__quote@
    288 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Plo@am__quote@
    289 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Plo@am__quote@
    290 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Plo@am__quote@
     253@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     254@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
     255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
     256@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
     257@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
     258@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
    291259
    292260.cc.o:
    … …  
    305273@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    306274@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    307 
    308 .cc.lo:
    309 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    310 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    311 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    312 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    313 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    314 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    315 
    316 mostlyclean-libtool:
    317         -rm -f *.lo
    318 
    319 clean-libtool:
    320         -rm -rf .libs _libs
    321 
    322 distclean-libtool:
    323         -rm -f libtool
    324275uninstall-info-am:
    325276
    … …  
    401352check-am: all-am
    402353check: check-am
    403 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     354all-am: Makefile $(LIBRARIES) $(HEADERS)
    404355installdirs:
    405         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    406           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    407         done
    408356install: install-am
    409357install-exec: install-exec-am
    … …  
    432380clean: clean-am
    433381
    434 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    435         mostlyclean-am
     382clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    436383
    437384distclean: distclean-am
    … …  
    439386        -rm -f Makefile
    440387distclean-am: clean-am distclean-compile distclean-generic \
    441         distclean-libtool distclean-tags
     388        distclean-tags
    442389
    443390dvi: dvi-am
    … …  
    453400install-data-am:
    454401
    455 install-exec-am: install-pkglibLTLIBRARIES
     402install-exec-am:
    456403
    457404install-info: install-info-am
    … …  
    468415mostlyclean: mostlyclean-am
    469416
    470 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    471         mostlyclean-libtool
     417mostlyclean-am: mostlyclean-compile mostlyclean-generic
    472418
    473419pdf: pdf-am
    … …  
    479425ps-am:
    480426
    481 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     427uninstall-am: uninstall-info-am
    482428
    483429.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    484         clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    485         distclean-compile distclean-generic distclean-libtool \
    486         distclean-tags distdir dvi dvi-am html html-am info info-am \
    487         install install-am install-data install-data-am install-exec \
    488         install-exec-am install-info install-info-am install-man \
    489         install-pkglibLTLIBRARIES install-strip installcheck \
     430        clean-noinstLIBRARIES ctags distclean distclean-compile \
     431        distclean-generic distclean-tags distdir dvi dvi-am html \
     432        html-am info info-am install install-am install-data \
     433        install-data-am install-exec install-exec-am install-info \
     434        install-info-am install-man install-strip installcheck \
    490435        installcheck-am installdirs maintainer-clean \
    491436        maintainer-clean-generic mostlyclean mostlyclean-compile \
    492         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    493         tags uninstall uninstall-am uninstall-info-am \
    494         uninstall-pkglibLTLIBRARIES
     437        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     438        uninstall-am uninstall-info-am
    495439
    496440include $(MAINSRCDIR)/defs/include_paths.am

  • trunk/src/lib/graphics/spatial_separation/Makefile.am

    r5452 r5463  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 pkglib_LTLIBRARIES = libORXquadtree.la
     4noinst_LIBRARIES = libORXquadtree.a
    55
    6 libORXquadtree_la_SOURCES = quadtree.cc \
    7                             quadtree_node.cc \
    8                             spatial_separation.cc
     6libORXquadtree_a_SOURCES = quadtree.cc \
     7                           quadtree_node.cc \
     8                           spatial_separation.cc
    99
    1010noinst_HEADERS =  quadtree.h \

  • trunk/src/lib/graphics/spatial_separation/Makefile.in

    r5452 r5463  
    1616
    1717
    18 SOURCES = $(libORXquadtree_la_SOURCES)
     18SOURCES = $(libORXquadtree_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    4949CONFIG_HEADER = $(top_builddir)/config.h
    5050CONFIG_CLEAN_FILES =
    51 am__installdirs = "$(DESTDIR)$(pkglibdir)"
    52 pkglibLTLIBRARIES_INSTALL = $(INSTALL)
    53 LTLIBRARIES = $(pkglib_LTLIBRARIES)
    54 libORXquadtree_la_LIBADD =
    55 am_libORXquadtree_la_OBJECTS = quadtree.lo quadtree_node.lo \
    56         spatial_separation.lo
    57 libORXquadtree_la_OBJECTS = $(am_libORXquadtree_la_OBJECTS)
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXquadtree_a_AR = $(AR) $(ARFLAGS)
     55libORXquadtree_a_LIBADD =
     56am_libORXquadtree_a_OBJECTS = quadtree.$(OBJEXT) \
     57        quadtree_node.$(OBJEXT) spatial_separation.$(OBJEXT)
     58libORXquadtree_a_OBJECTS = $(am_libORXquadtree_a_OBJECTS)
    5859DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5960depcomp = $(SHELL) $(top_srcdir)/depcomp
    6061am__depfiles_maybe = depfiles
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Plo \
    62 @AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Plo \
    63 @AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Plo
     62@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/quadtree.Po \
     63@AMDEP_TRUE@    ./$(DEPDIR)/quadtree_node.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/spatial_separation.Po
    6465CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6566        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    66 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
    67         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
    68         $(AM_CXXFLAGS) $(CXXFLAGS)
    6967CXXLD = $(CXX)
    70 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    71         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    72 SOURCES = $(libORXquadtree_la_SOURCES)
    73 DIST_SOURCES = $(libORXquadtree_la_SOURCES)
     68CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     69        -o $@
     70SOURCES = $(libORXquadtree_a_SOURCES)
     71DIST_SOURCES = $(libORXquadtree_a_SOURCES)
    7472HEADERS = $(noinst_HEADERS)
    7573ETAGS = etags
    … …  
    8078AMDEP_TRUE = @AMDEP_TRUE@
    8179AMTAR = @AMTAR@
    82 AR = @AR@
    8380AUTOCONF = @AUTOCONF@
    8481AUTOHEADER = @AUTOHEADER@
    … …  
    9390CURL_LIBS = @CURL_LIBS@
    9491CXX = @CXX@
    95 CXXCPP = @CXXCPP@
    9692CXXDEPMODE = @CXXDEPMODE@
    9793CXXFLAGS = @CXXFLAGS@
    … …  
    105101DOXYGEN_FALSE = @DOXYGEN_FALSE@
    106102DOXYGEN_TRUE = @DOXYGEN_TRUE@
    107 ECHO = @ECHO@
    108103ECHO_C = @ECHO_C@
    109104ECHO_N = @ECHO_N@
    … …  
    111106EGREP = @EGREP@
    112107EXEEXT = @EXEEXT@
    113 F77 = @F77@
    114 FFLAGS = @FFLAGS@
    115108GPROF = @GPROF@
    116109GTK2_CFLAGS = @GTK2_CFLAGS@
    … …  
    127120LIBOBJS = @LIBOBJS@
    128121LIBS = @LIBS@
    129 LIBTOOL = @LIBTOOL@
    130 LN_S = @LN_S@
    131122LTLIBOBJS = @LTLIBOBJS@
    132123MAKEINFO = @MAKEINFO@
    … …  
    148139SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    149140VERSION = @VERSION@
    150 ac_ct_AR = @ac_ct_AR@
    151141ac_ct_CC = @ac_ct_CC@
    152142ac_ct_CXX = @ac_ct_CXX@
    153 ac_ct_F77 = @ac_ct_F77@
    154143ac_ct_RANLIB = @ac_ct_RANLIB@
    155144ac_ct_STRIP = @ac_ct_STRIP@
    … …  
    194183target_vendor = @target_vendor@
    195184MAINSRCDIR = ../../..
    196 pkglib_LTLIBRARIES = libORXquadtree.la
    197 libORXquadtree_la_SOURCES = quadtree.cc \
    198                             quadtree_node.cc \
    199                             spatial_separation.cc
     185noinst_LIBRARIES = libORXquadtree.a
     186libORXquadtree_a_SOURCES = quadtree.cc \
     187                           quadtree_node.cc \
     188                           spatial_separation.cc
    200189
    201190noinst_HEADERS = quadtree.h \
    … …  
    206195
    207196.SUFFIXES:
    208 .SUFFIXES: .cc .lo .o .obj
     197.SUFFIXES: .cc .o .obj
    209198$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    210199        @for dep in $?; do \
    … …  
    216205          esac; \
    217206        done; \
    218         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile'; \
     207        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile'; \
    219208        cd $(top_srcdir) && \
    220           $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile
     209          $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile
    221210.PRECIOUS: Makefile
    222211Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    236225$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    237226        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    238 install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
    239         @$(NORMAL_INSTALL)
    240         test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
    241         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    242           if test -f $$p; then \
    243             f="`echo $$p | sed -e 's|^.*/||'`"; \
    244             echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
    245             $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
    246           else :; fi; \
    247         done
    248 
    249 uninstall-pkglibLTLIBRARIES:
    250         @$(NORMAL_UNINSTALL)
    251         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    252             p="`echo $$p | sed -e 's|^.*/||'`"; \
    253           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
    254           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
    255         done
    256 
    257 clean-pkglibLTLIBRARIES:
    258         -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
    259         @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
    260           dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    261           test "$$dir" != "$$p" || dir=.; \
    262           echo "rm -f \"$${dir}/so_locations\""; \
    263           rm -f "$${dir}/so_locations"; \
    264         done
    265 libORXquadtree.la: $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_DEPENDENCIES)
    266         $(CXXLINK) -rpath $(pkglibdir) $(libORXquadtree_la_LDFLAGS) $(libORXquadtree_la_OBJECTS) $(libORXquadtree_la_LIBADD) $(LIBS)
     227
     228clean-noinstLIBRARIES:
     229        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     230libORXquadtree.a: $(libORXquadtree_a_OBJECTS) $(libORXquadtree_a_DEPENDENCIES)
     231        -rm -f libORXquadtree.a
     232        $(libORXquadtree_a_AR) libORXquadtree.a $(libORXquadtree_a_OBJECTS) $(libORXquadtree_a_LIBADD)
     233        $(RANLIB) libORXquadtree.a
    267234
    268235mostlyclean-compile:
    … …  
    272239        -rm -f *.tab.c
    273240
    274 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree.Plo@am__quote@
    275 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree_node.Plo@am__quote@
    276 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spatial_separation.Plo@am__quote@
     241@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree.Po@am__quote@
     242@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quadtree_node.Po@am__quote@
     243@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spatial_separation.Po@am__quote@
    277244
    278245.cc.o:
    … …  
    291258@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    292259@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    293 
    294 .cc.lo:
    295 @am__fastdepCXX_TRUE@   if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
    296 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
    297 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
    298 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
    299 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    300 @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
    301 
    302 mostlyclean-libtool:
    303         -rm -f *.lo
    304 
    305 clean-libtool:
    306         -rm -rf .libs _libs
    307 
    308 distclean-libtool:
    309         -rm -f libtool
    310260uninstall-info-am:
    311261
    … …  
    387337check-am: all-am
    388338check: check-am
    389 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
     339all-am: Makefile $(LIBRARIES) $(HEADERS)
    390340installdirs:
    391         for dir in "$(DESTDIR)$(pkglibdir)"; do \
    392           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    393         done
    394341install: install-am
    395342install-exec: install-exec-am
    … …  
    418365clean: clean-am
    419366
    420 clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
    421         mostlyclean-am
     367clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    422368
    423369distclean: distclean-am
    … …  
    425371        -rm -f Makefile
    426372distclean-am: clean-am distclean-compile distclean-generic \
    427         distclean-libtool distclean-tags
     373        distclean-tags
    428374
    429375dvi: dvi-am
    … …  
    439385install-data-am:
    440386
    441 install-exec-am: install-pkglibLTLIBRARIES
     387install-exec-am:
    442388
    443389install-info: install-info-am
    … …  
    454400mostlyclean: mostlyclean-am
    455401
    456 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
    457         mostlyclean-libtool
     402mostlyclean-am: mostlyclean-compile mostlyclean-generic
    458403
    459404pdf: pdf-am
    … …  
    465410ps-am:
    466411
    467 uninstall-am: uninstall-info-am uninstall-pkglibLTLIBRARIES
     412uninstall-am: uninstall-info-am
    468413
    469414.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    470         clean-libtool clean-pkglibLTLIBRARIES ctags distclean \
    471         distclean-compile distclean-generic distclean-libtool \
    472         distclean-tags distdir dvi dvi-am html html-am info info-am \
    473         install install-am install-data install-data-am install-exec \
    474         install-exec-am install-info install-info-am install-man \
    475         install-pkglibLTLIBRARIES install-strip installcheck \
     415        clean-noinstLIBRARIES ctags distclean distclean-compile \
     416        distclean-generic distclean-tags distdir dvi dvi-am html \
     417        html-am info info-am install install-am install-data \
     418        install-data-am install-exec install-exec-am install-info \
     419        install-info-am install-man install-strip installcheck \
    476420        installcheck-am installdirs maintainer-clean \
    477421        maintainer-clean-generic mostlyclean mostlyclean-compile \
    478         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    479         tags uninstall uninstall-am uninstall-info-am \
    480         uninstall-pkglibLTLIBRARIES
     422        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     423        uninstall-am uninstall-info-am
    481424
    482425include $(MAINSRCDIR)/defs/include_paths.am
Note: See TracChangeset for help on using the changeset viewer.