Context Navigation

← Previous Change
Next Change →

Makefile.am

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

: 4 edited

. (modified) (1 prop)
psModules (modified) (1 prop)
psModules/src/objects (modified) (1 prop)
psModules/src/objects/Makefile.am (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/meh_branches/ppstack_test

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20110710 (added)	merged: 31852,31867,31924-31927,31966,31987-31992,32023,32054-32057,32149-32160,32200-32205,32215-32216,32234-32248,32287-32289,32299-32302,32307-32324,32328-32330,32333-32345
/branches/eam_branches/ipp-20110906 (added)	merged: 32363,32558,32568-32569,32583-32585,32598-32599,32605-32608,32610-32614,32616-32621,32627-32630
/branches/eam_branches/ipp-20111110 (added)	merged: 32645-32647,32660-32663,32685-32686,32689-32694
/branches/haf_add201112 (added)	merged: 32980-32981,32984-32987,32989,32992,33003,33005,33008-33009,33012,33017-33018,33021-33023,33027
/trunk (added)	merged: 32135-32145,32147,32162-32166,32168,32170,32172-32184,32186-32187,32191-32195,32197,32199,32206-32214,32217-32218,32220-32233,32249-32252,32254-32265,32267,32269,32271-32272,32276,32278-32279,32281,32283,32285-32286,32290,32292-32296,32298,32303-32306,32325-32327,32331-32332,32346-32356,32358-32362,32364,32366-32375,32379-32381,32383,32385,32387,32390,32392,32394,32396,32402-32404,32406,32408-32409,32411,32413,32415,32417,32419-32423,32426,32428,32430,32432,32434-32437,32442-32447,32449,32451-32469,32471,32473-32474,32477,32479-32483,32485,32487,32489-32497,32499-32502,32504,32506-32513,32515-32521,32524,32528-32529,32532,32534,32536-32537,32539-32544,32546-32547,32549,32551,32553-32554,32556-32557,32559,32562-32565,32567,32570,32573,32575,32577-32582,32586-32594,32596-32597,32600-32602,32604,32609,32615,32622-32625,32631-32637,32641-32644,32650,32652-32656,32658,32665-32666,32668-32669,32671,32674,32676,32678,32680-32682,32687,32695-32697,32699-32701,32703-32705,32707-32708,32710-32716,32720-32731,32733,32735-32751,32760-32773,32775-32791,32796-32797,32799-32803,32806-32810,32818-32826,32828-32833,32835-32838,32841-32842,32847,32856,32858,32860,32863-32864,32866,32868,32870,32872,32874,32876-32888,32890-32894,32897-32908,32914-32915,32917,32919-32920,32928,32930-32934,32937-32950,32952,32954-32955,32957,32959-32966,32968,32970-32977,32982-32983,32990,32996-33001,33004,33011,33013-33016,33019,33024,33028,33030-33032,33034-33036,33038-33039,33041-33043,33045,33051-33056,33058,33060,33062-33069,33072,33075-33077,33080,33083,33089-33091,33093,33108-33109,33111-33112,33119,33121,33124-33127,33140-33142,33144-33155,33160-33164,33166-33168,33170-33172,33175-33177,33181-33187,33189-33197,33208-33212,33232,33234-33237,33243,33245-33246,33248-33249,33252,33259-33269,33271-33273,33277,33282-33286,33289-33296,33299,33304,33310,33315,33317,33319,33321,33324,33326,33330-33337,33339-33340,33343,33345-33358,33366,33371,33377-33382,33384-33385,33389

branches/meh_branches/ppstack_test/psModules

Property svn:mergeinfo set to

branches/meh_branches/ppstack_test/psModules/src/objects

Property svn:ignore

-              old
+              new
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c

branches/meh_branches/ppstack_test/psModules/src/objects/Makefile.am

-              r31670
+              r33415
         pmSourceIO_CMF_PS1_V2.c \
         pmSourceIO_CMF_PS1_V3.c \
+        pmSourceIO_CMF_PS1_V4.c \
         pmSourceIO_CMF_PS1_SV1.c \
         pmSourceIO_CMF_PS1_DV1.c \
 …
 # pmSourceID_CMF_* functions use a common framework
 BUILT_SOURCES = pmSourceIO_CMF_PS1_V1.v1.c pmSourceIO_CMF_PS1_V2.v1.c pmSourceIO_CMF_PS1_V3.v1.c
+BUILT_SOURCES = pmSourceIO_CMF_PS1_V1.c pmSourceIO_CMF_PS1_V2.c pmSourceIO_CMF_PS1_V3.c pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_V1.v1.c : pmSourceIO_CMF.c.in mksource.pl
         mksource.pl pmSourceIO_CMF.c.in PS1_V1 pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V1.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_V1 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.v1.c : pmSourceIO_CMF.c.in mksource.pl
         mksource.pl pmSourceIO_CMF.c.in PS1_V2 pmSourceIO_CMF_PS1_V2.v1.c
+pmSourceIO_CMF_PS1_V2.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_V2 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.v1.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_V2 pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V3.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_V3 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c : pmSourceIO_CMF.c.in mksource.pl
+        mksource.pl pmSourceIO_CMF.c.in PS1_V4 pmSourceIO_CMF_PS1_V4.c
 # EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in

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

/branches/czw_branch/20101203/psModules	merged	eligible
/branches/eam_branches/ipp-20101103/psModules	merged	eligible
/branches/eam_branches/ipp-20101205/psModules	merged	eligible
/branches/eam_branches/ipp-20110213/psModules	merged	eligible
/branches/eam_branches/ipp-20110404/psModules	merged	eligible
/branches/eam_branches/ipp-20110505/psModules	merged	eligible
/branches/eam_branches/ipp-20110710/psModules	merged	eligible
/branches/eam_branches/ipp-20110906/psModules	merged	eligible
/branches/eam_branches/ipp-20111110/psModules	merged	eligible
/branches/eam_branches/ipp-20111122/psModules	merged	eligible
/branches/haf_add201112/psModules	merged	eligible
/trunk/psModules	merged	eligible

Context Navigation

Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/objects/Makefile.am

Legend:

branches/meh_branches/ppstack_test

branches/meh_branches/ppstack_test/psModules

branches/meh_branches/ppstack_test/psModules/src/objects

branches/meh_branches/ppstack_test/psModules/src/objects/Makefile.am

Download in other formats: