Context Navigation

Makefile.am

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

Property svn:mergeinfo changed

/branches/eam_branches/20090522 (added)	merged: 24238,24529,24557,24559,24565-24570,24573
/trunk (added)	merged: 23949-24012,24014-24068,24070-24119,24121-24131,24137-24144,24146,24155,24165-24167,24174-24175,24177-24220,24222-24237,24239-24242,24245-24308,24311-24372,24374,24378-24391,24393-24412,24414-24415,24417-24426,24431-24434,24440-24441,24453-24455,24458-24498,24500,24502,24506,24508,24510-24513,24515-24528,24530-24556,24558,24560-24564,24571-24572,24574-24712,24714-24742,24744-24784,24786-24798,24801-24824,24827-24834,24836-24859,24861-24901,24903-24912,24914-24950,24953-24971,24973-24977,24986-24989,24993-25017,25019,25021,25023-25024,25026
/branches/eam_branches/eam_branch_20090303	removed
/branches/pap	removed

Property svn:ignore

old	new
17	17	growthTest
18	18	psphotVersionDefinitions.h
	19	psphotMomentsStudy

-              r23808
+              r25027
 libpsphot_la_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 bin_PROGRAMS = psphot psphotTest
+bin_PROGRAMS = psphot psphotTest psphotMomentsStudy
 psphot_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
 …
 psphotTest_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 psphotTest_LDADD = libpsphot.la
+psphotMomentsStudy_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
+psphotMomentsStudy_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
+psphotMomentsStudy_LDADD = libpsphot.la
 psphot_SOURCES = \
 …
 psphotTest_SOURCES = \
         psphotTest.c
+psphotMomentsStudy_SOURCES = \
+        psphotMomentsStudy.c
 libpsphot_la_SOURCES = \

Note: See TracChangeset for help on using the changeset viewer.