[Fedora-directory-commits] dsgw dummy.cpp, NONE, 1.1 Makefile.am, 1.11, 1.12 aclocal.m4, 1.8, 1.9 configure, 1.11, 1.12 missing, 1.7, 1.8 install-sh, 1.7, 1.8 depcomp, 1.7, 1.8 compile, 1.7, 1.8 Makefile.in, 1.11, 1.12 config.sub, 1.7, 1.8 config.guess, 1.7, 1.8

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Wed Jan 30 17:47:52 UTC 2008 

Author: rmeggins

Update of /cvs/dirsec/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31357/dsgw

Modified Files:
	Makefile.am aclocal.m4 configure missing install-sh depcomp 
	compile Makefile.in config.sub config.guess 
Added Files:
	dummy.cpp 
Log Message:
add dummy c++ file to force automake to define CXXLINK


--- NEW FILE dummy.cpp ---
// this is just a dummy
// C++ program to make automake define
// the macro CXXLINK
int
main(int argc, char *argv[])
{
	int ii = 1;
	int jj = ii;
}


Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.am	30 Jan 2008 17:38:03 -0000	1.11
+++ Makefile.am	30 Jan 2008 17:47:50 -0000	1.12
@@ -67,6 +67,16 @@
 	@nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \
 	@nspr_lib@ -lplds4 -lplc4 -lnspr4
 
+noinst_PROGRAMS = propmaker
+
+# this is just a dummy to make automake define
+# the CXXLINK macro
+if CXXLINK_REQUIRED
+noinst_PROGRAMS += dummy
+dummy_SOURCES = dummy.cpp
+dummy_LINK = $(CXXLINK)
+endif
+
 if CXXLINK_REQUIRED
 MYLINK = $(CXXLINK)
 else
@@ -101,7 +111,6 @@
 cgibin_SCRIPTS += $(DBGSCRIPTS)
 endif
 
-noinst_PROGRAMS = propmaker
 # I need propmaker to build with no libraries - I don't know of any other way to set
 # the LIBS for a specific program (no, propmaker_LIBS doesn't work) - LDADD is the
 # last thing on the link line before LIBS, so just have it terminate the command














Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/dsgw/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in	30 Jan 2008 17:38:03 -0000	1.11
+++ Makefile.in	30 Jan 2008 17:47:50 -0000	1.12
@@ -60,11 +60,15 @@
 host_triplet = @host@
 @WINNT_TRUE at am__append_1 = -DXP_WINNT
 @WINNT_FALSE at am__append_2 = -DXP_UNIX
+noinst_PROGRAMS = propmaker$(EXEEXT) $(am__EXEEXT_2)
+
+# this is just a dummy to make automake define
+# the CXXLINK macro
+ at CXXLINK_REQUIRED_TRUE@am__append_3 = dummy
 cgibin_PROGRAMS = auth$(EXEEXT) doauth$(EXEEXT) edit$(EXEEXT) \
 	domodify$(EXEEXT) dnedit$(EXEEXT) dosearch$(EXEEXT) \
 	$(am__EXEEXT_1)
- at DEBUG_TRUE@am__append_3 = $(DBGSCRIPTS)
-noinst_PROGRAMS = propmaker$(EXEEXT)
+ at DEBUG_TRUE@am__append_4 = $(DBGSCRIPTS)
 DIST_COMMON = README $(am__configure_deps) $(dist_config_DATA) \
 	$(dist_gwinfo_DATA) $(dist_html_DATA) $(dist_maninst_DATA) \
 	$(dist_orghtml_DATA) $(dist_pbconfig_DATA) $(dist_pbhtml_DATA) \
@@ -94,6 +98,7 @@
 	"$(DESTDIR)$(pbconfigdir)" "$(DESTDIR)$(pbhtmldir)" \
 	"$(DESTDIR)$(contextdir)" "$(DESTDIR)$(propertydir)"
 cgibinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ at CXXLINK_REQUIRED_TRUE@am__EXEEXT_2 = dummy$(EXEEXT)
 PROGRAMS = $(cgibin_PROGRAMS) $(noinst_PROGRAMS)
 am__objects_1 = htmlout.$(OBJEXT) htmlparse.$(OBJEXT) error.$(OBJEXT) \
 	cgiutil.$(OBJEXT) dsgwutil.$(OBJEXT) ldaputil.$(OBJEXT) \
@@ -120,6 +125,10 @@
 am_dosearch_OBJECTS = dosearch.$(OBJEXT) $(am__objects_1)
 dosearch_OBJECTS = $(am_dosearch_OBJECTS)
 dosearch_LDADD = $(LDADD)
+am__dummy_SOURCES_DIST = dummy.cpp
+ at CXXLINK_REQUIRED_TRUE@am_dummy_OBJECTS = dummy.$(OBJEXT)
+dummy_OBJECTS = $(am_dummy_OBJECTS)
+dummy_LDADD = $(LDADD)
 am_edit_OBJECTS = edit.$(OBJEXT) $(am__objects_1)
 edit_OBJECTS = $(am_edit_OBJECTS)
 edit_LDADD = $(LDADD)
@@ -158,16 +167,24 @@
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(auth_SOURCES) $(csearch_SOURCES) $(dnedit_SOURCES) \
 	$(doauth_SOURCES) $(domodify_SOURCES) $(dosearch_SOURCES) \
-	$(edit_SOURCES) $(lang_SOURCES) $(newentry_SOURCES) \
-	propmaker.c $(search_SOURCES) $(tutor_SOURCES) \
-	$(unauth_SOURCES)
+	$(dummy_SOURCES) $(edit_SOURCES) $(lang_SOURCES) \
+	$(newentry_SOURCES) propmaker.c $(search_SOURCES) \
+	$(tutor_SOURCES) $(unauth_SOURCES)
 DIST_SOURCES = $(auth_SOURCES) $(csearch_SOURCES) $(dnedit_SOURCES) \
 	$(doauth_SOURCES) $(domodify_SOURCES) $(dosearch_SOURCES) \
-	$(edit_SOURCES) $(lang_SOURCES) $(newentry_SOURCES) \
-	propmaker.c $(search_SOURCES) $(tutor_SOURCES) \
-	$(unauth_SOURCES)
+	$(am__dummy_SOURCES_DIST) $(edit_SOURCES) $(lang_SOURCES) \
+	$(newentry_SOURCES) propmaker.c $(search_SOURCES) \
+	$(tutor_SOURCES) $(unauth_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -387,6 +404,8 @@
 	-DINSTCONFIGDIR=\"$(instconfigdir)\" \
 	-DMANUALDIR=\"$(manualdir)\" -DCGIURIBASE=\"$(cgiuri)\" \
 	-DMANUALSUBDIR=\"$(manualsubdir)\" -DINFODIR=\"$(gwinfodir)\"
+ at CXXLINK_REQUIRED_TRUE@dummy_SOURCES = dummy.cpp
+ at CXXLINK_REQUIRED_TRUE@dummy_LINK = $(CXXLINK)
 @CXXLINK_REQUIRED_FALSE at MYLINK = $(LINK)
 @CXXLINK_REQUIRED_TRUE at MYLINK = $(CXXLINK)
 
@@ -406,8 +425,9 @@
 newentry_LINK = $(MYLINK)
 tutor_LINK = $(MYLINK)
 lang_LINK = $(MYLINK)
-cgibin_SCRIPTS = orgbin/org orgbin/myorg $(am__append_3)
+cgibin_SCRIPTS = orgbin/org orgbin/myorg $(am__append_4)
 @DEBUG_TRUE at DBGSCRIPTS = $(addsuffix .sh,$(cgibin_PROGRAMS))
+
 # I need propmaker to build with no libraries - I don't know of any other way to set
 # the LIBS for a specific program (no, propmaker_LIBS doesn't work) - LDADD is the
 # last thing on the link line before LIBS, so just have it terminate the command
@@ -578,7 +598,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -682,6 +702,9 @@
 dosearch$(EXEEXT): $(dosearch_OBJECTS) $(dosearch_DEPENDENCIES) 
 	@rm -f dosearch$(EXEEXT)
 	$(dosearch_LINK) $(dosearch_LDFLAGS) $(dosearch_OBJECTS) $(dosearch_LDADD) $(LIBS)
+dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES) 
+	@rm -f dummy$(EXEEXT)
+	$(dummy_LINK) $(dummy_LDFLAGS) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
 edit$(EXEEXT): $(edit_OBJECTS) $(edit_DEPENDENCIES) 
 	@rm -f edit$(EXEEXT)
 	$(edit_LINK) $(edit_LDFLAGS) $(edit_OBJECTS) $(edit_LDADD) $(LIBS)
@@ -761,6 +784,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dosearch.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dsgwgetlang.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dsgwutil.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dummy.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/edit.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/emitauth.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/emitf.Po at am__quote@
@@ -803,6 +827,30 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+.cpp.o:
+ at am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+ at am__fastdepCXX_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCXX_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
+ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+ at am__fastdepCXX_TRUE@	then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo

More information about the Fedora-directory-commits mailing list