Permalink
Browse files

In an effort to quell complaints from libtool about "objects compat/f…

…lsl.o not portable!", make compat an active subdirectory and turn all compatibility objects into a non-installed libtool static library.

git-svn-id: https://opencflite.svn.sourceforge.net/svnroot/opencflite@62 949b7c4e-b822-e185-8c53-f993a654f32e
  • Loading branch information...
1 parent 5f1ec28 commit 472c83c21e5ea2623b525e1dacc1a818f20da057 geric001 committed Feb 8, 2009
View
@@ -2,7 +2,7 @@
# built before tests and examples, so we explicitly add '.' to the
# list of subdirectories.l
-SUBDIRS = include . tests examples
+SUBDIRS = include compat . tests examples
#
# We don't want to modify any of the package source to include the
@@ -45,7 +45,7 @@ CF_COMMON_CFLAGS = $(AM_CFLAGS)
CF_COMMON_LDFLAGS = $(AM_LDFLAGS) \
-version-info $(CF_VERSION_INFO)
-CF_COMMON_LIBADD = $(AM_LDADD) $(LIBOBJS)
+CF_COMMON_LIBADD = $(AM_LDADD) compat/libcompat.la
noinst_HEADERS = auto_stubs.h \
CFBundle_BinaryTypes.h \
View
@@ -54,11 +54,10 @@ subdir = .
DIST_COMMON = README $(CF_include_HEADERS) $(am__configure_deps) \
$(noinst_HEADERS) $(srcdir)/CoreFoundation.pc.in \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/configure INSTALL TODO compat/flsl.c \
- compat/gettimeofday.c compat/strlcat.c compat/strlcpy.c \
- config/compile config/config.guess config/config.sub \
- config/depcomp config/install-sh config/ltmain.sh \
- config/missing config/mkinstalldirs
+ $(top_srcdir)/configure INSTALL TODO config/compile \
+ config/config.guess config/config.sub config/depcomp \
+ config/install-sh config/ltmain.sh config/missing \
+ config/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
$(top_srcdir)/configure.ac
@@ -80,8 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(CF_includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-LIBOBJDIR = compat/
-am__DEPENDENCIES_1 = $(LIBOBJS)
+am__DEPENDENCIES_1 = compat/libcompat.la
libCoreFoundation_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am__objects_1 = libCoreFoundation_la-CFApplicationPreferences.lo \
libCoreFoundation_la-CFArray.lo libCoreFoundation_la-CFBag.lo \
@@ -528,7 +526,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = include . tests examples
+SUBDIRS = include compat . tests examples
#
# Data file for pkg-config
@@ -558,7 +556,7 @@ CF_COMMON_CFLAGS = $(AM_CFLAGS)
CF_COMMON_LDFLAGS = $(AM_LDFLAGS) \
-version-info $(CF_VERSION_INFO)
-CF_COMMON_LIBADD = $(AM_LDADD) $(LIBOBJS)
+CF_COMMON_LIBADD = $(AM_LDADD) compat/libcompat.la
noinst_HEADERS = auto_stubs.h \
CFBundle_BinaryTypes.h \
CFBundle_Internal.h \
@@ -1132,31 +1130,24 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libCoreFoundation_profile_la-CFXMLPreferencesDomain.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libCoreFoundation_profile_la-CFXMLTree.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libCoreFoundation_profile_la-Cocotron.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/flsl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/gettimeofday.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/strlcat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@compat/$(DEPDIR)/strlcpy.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Po
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@ mv -f $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -2866,7 +2857,6 @@ install-strip:
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
- -test -z "$(LIBOBJS)" || rm -f $(LIBOBJS)
clean-generic:
@@ -2883,7 +2873,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR) compat/$(DEPDIR)
+ -rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
@@ -2920,7 +2910,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR) compat/$(DEPDIR)
+ -rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
View
@@ -0,0 +1,4 @@
+noinst_LTLIBRARIES = libcompat.la
+
+libcompat_la_SOURCES =
+libcompat_la_LIBADD = @LTLIBOBJS@
Oops, something went wrong.

0 comments on commit 472c83c

Please sign in to comment.